diff src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java @ 479:8f5a2d152c38

merge
author oshiro
date Wed, 28 Nov 2018 19:05:58 +0900
parents f0bd5f2c4ba3
children 141f627665ab
line wrap: on
line diff
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java	Wed Nov 28 19:00:59 2018 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java	Wed Nov 28 19:05:58 2018 +0900
@@ -209,7 +209,7 @@
                                     int singleHeight = buf.getInt();
                                     int port = buf.getInt();
                                     int scale = buf.getInt();
-                                    System.out.println("Root server change request :" + newHostName + " : " + port);
+                                    System.out.println("Root server change request :" + newHostName + " : " + port + " id:" + id);
                                     changeVNCServer(viewer, newHostName, port, x, y, singleWidth, singleHeight, scale, id, is, os);
                                 } else {
                                     continue;
@@ -901,6 +901,10 @@
         }
         enableChildrenTransmission();
         printNetworkInterface();
+        System.out.println("newVNCConenction reconnectingId: " + connectionPresenter.getReconnectingId());
+        if (isTreeManager()) {
+            sharingId = connectionPresenter.getReconnectingId();
+        }
         sendDesktopSizeChange(connectionPresenter.getReconnectingId());
     }