commit 3c7eb5b594bd0eee8174415fdaa0cef29e4aef2f
author Brian P. Hinz <bphinz@users.sf.net> Thu Aug 20 00:26:28 2015 -0400
committer Brian P. Hinz <bphinz@users.sf.net> Thu Aug 20 00:26:28 2015 -0400
tree 115831d38f67129abba33674cf9c7a1d79a7848d
parent c245fa2ef29e8a985586761411cee23787d08aaa

Fix desktopSize parameter issue

desktopSize preference was being applied even if the checkbox was
unselected in the dialog is a value had previously been stored in
the preferences file.

java/com/tigervnc/vncviewer/CConn.java

diff --git a/java/com/tigervnc/vncviewer/CConn.java b/java/com/tigervnc/vncviewer/CConn.java
index 5ce1c2f..71bd090 100644
--- a/java/com/tigervnc/vncviewer/CConn.java
+++ b/java/com/tigervnc/vncviewer/CConn.java
@@ -1208,11 +1208,9 @@
         Security.DisableSecType(Security.secTypeX509Ident);
       }
     }
-    if (options.desktopSize.isSelected()) {
-      String desktopSize =
-        options.desktopWidth.getText() + "x" + options.desktopHeight.getText();
-      viewer.desktopSize.setParam(desktopSize);
-    }
+    String desktopSize = (options.desktopSize.isSelected()) ?
+        options.desktopWidth.getText() + "x" + options.desktopHeight.getText() : "";
+    viewer.desktopSize.setParam(desktopSize);
     if (options.fullScreen.isSelected() ^ fullScreen)
       toggleFullScreen();
   }