summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorBrian P. Hinz <bphinz@users.sf.net>2015-08-20 00:26:28 -0400
committerBrian P. Hinz <bphinz@users.sf.net>2015-08-20 00:26:28 -0400
commit3c7eb5b594bd0eee8174415fdaa0cef29e4aef2f (patch)
tree115831d38f67129abba33674cf9c7a1d79a7848d /java
parentc245fa2ef29e8a985586761411cee23787d08aaa (diff)
downloadtigervnc-3c7eb5b594bd0eee8174415fdaa0cef29e4aef2f.tar.gz
tigervnc-3c7eb5b594bd0eee8174415fdaa0cef29e4aef2f.zip
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.
Diffstat (limited to 'java')
-rw-r--r--java/com/tigervnc/vncviewer/CConn.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/java/com/tigervnc/vncviewer/CConn.java b/java/com/tigervnc/vncviewer/CConn.java
index 5ce1c2f7..71bd0901 100644
--- a/java/com/tigervnc/vncviewer/CConn.java
+++ b/java/com/tigervnc/vncviewer/CConn.java
@@ -1208,11 +1208,9 @@ public class CConn extends CConnection implements
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();
}