aboutsummaryrefslogtreecommitdiffstats
path: root/java/com
diff options
context:
space:
mode:
authorBrian P. Hinz <bphinz@users.sf.net>2015-08-20 01:46:00 -0400
committerBrian P. Hinz <bphinz@users.sf.net>2015-08-20 01:46:00 -0400
commit4644abb3e6024d960f98b09c7b11d8dd89c3772b (patch)
tree1d972d49d3a32785e7c69cfe8b9364da0cbc0e60 /java/com
parent8442509bca6db16a009784517fd1a2531b9476b6 (diff)
downloadtigervnc-4644abb3e6024d960f98b09c7b11d8dd89c3772b.tar.gz
tigervnc-4644abb3e6024d960f98b09c7b11d8dd89c3772b.zip
Disable desktopSize option for embedded applets
Diffstat (limited to 'java/com')
-rw-r--r--java/com/tigervnc/vncviewer/OptionsDialog.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/java/com/tigervnc/vncviewer/OptionsDialog.java b/java/com/tigervnc/vncviewer/OptionsDialog.java
index ebfaed73..6eb0072b 100644
--- a/java/com/tigervnc/vncviewer/OptionsDialog.java
+++ b/java/com/tigervnc/vncviewer/OptionsDialog.java
@@ -167,7 +167,8 @@ class OptionsDialog extends Dialog implements
ScreenPanel=new JPanel(new GridBagLayout());
desktopSize = new JCheckBox("Resize remote session on connect");
desktopSize.addItemListener(this);
- desktopSize.setEnabled(cc.viewer.desktopSize.getValue() != null);
+ desktopSize.setEnabled(!cc.viewer.embed.getValue() &&
+ (cc.viewer.desktopSize.getValue() != null));
NumberFormat format = NumberFormat.getIntegerInstance();
format.setMaximumIntegerDigits(5);
format.setMinimumIntegerDigits(0);