changeset 191:971b4ea361e8

fix setReadyReconnect.
author oc
date Wed, 25 Jun 2014 19:48:03 +0900
parents 6aa1c0f4ab2e
children aa00e4b2fc27
files src/main/java/jp/ac/u_ryukyu/treevnc/MyRfbProto.java src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/MyRfbProto.java	Wed Jun 25 19:19:17 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/MyRfbProto.java	Wed Jun 25 19:48:03 2014 +0900
@@ -349,7 +349,7 @@
 	}
 
 	public synchronized void setReadyReconnect(boolean ready) {
-	    if (reconnecting) {
+	    if (ready && reconnecting) {
 	        sendDesktopSizeChange(reconnectingId);
 	        reconnecting = false;
 	    } 
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java	Wed Jun 25 19:19:17 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java	Wed Jun 25 19:48:03 2014 +0900
@@ -832,7 +832,7 @@
         	public void actionPerformed(ActionEvent e) {
         	    // before change server, data from previous server
         	    // should be stopped.
-        	    viewer.setCuiVersion(true);
+        	    viewer.setCuiVersion(false);
         	    if (viewer.getRfb().isRoot()) {
         	        try {
         	            viewer.getRfb().changeVNCServer(viewer, "127.0.0.1", 1980, 1090, viewer.getRfb().getId());