summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Tkac <atkac@redhat.com>2011-02-01 14:33:41 +0000
committerAdam Tkac <atkac@redhat.com>2011-02-01 14:33:41 +0000
commit1238c043fd1d7ee129b270ca9f0d02b9fa11dfbd (patch)
treefc413250d77347da4116660e0b03cedaa11f2b43
parentd41d4be5a41e735f56b700d4459a8f9c2d20bc41 (diff)
downloadtigervnc-1238c043fd1d7ee129b270ca9f0d02b9fa11dfbd.tar.gz
tigervnc-1238c043fd1d7ee129b270ca9f0d02b9fa11dfbd.zip
[Bugfix] win vncviewer: preserve security settings during reconnection
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4243 3789f03b-4d11-0410-bbf8-ca57d06f2519
-rw-r--r--win/vncviewer/CConn.cxx2
-rw-r--r--win/vncviewer/CConnOptions.cxx1
2 files changed, 3 insertions, 0 deletions
diff --git a/win/vncviewer/CConn.cxx b/win/vncviewer/CConn.cxx
index 6a6561d7..b34b56eb 100644
--- a/win/vncviewer/CConn.cxx
+++ b/win/vncviewer/CConn.cxx
@@ -172,6 +172,8 @@ CConn::applyOptions(CConnOptions& opt) {
if (!options.useLocalCursor)
window->setCursor(0, 0, Point(), 0, 0);
}
+
+ security->SetSecTypes(options.secTypes);
}
diff --git a/win/vncviewer/CConnOptions.cxx b/win/vncviewer/CConnOptions.cxx
index f4085b4d..3152db9e 100644
--- a/win/vncviewer/CConnOptions.cxx
+++ b/win/vncviewer/CConnOptions.cxx
@@ -501,6 +501,7 @@ CConnOptions& CConnOptions::operator=(const CConnOptions& o) {
qualityLevel = o.qualityLevel;
autoScaling = o.autoScaling;
scale = o.scale;
+ secTypes = o.secTypes;
return *this;
}