comparison src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java @ 479:8f5a2d152c38

merge
author oshiro
date Wed, 28 Nov 2018 19:05:58 +0900
parents 126b84644ca7
children 6e30cb5d905f
comparison
equal deleted inserted replaced
478:8cee5a014d32 479:8f5a2d152c38
182 presenter.showMessage("Started"); 182 presenter.showMessage("Started");
183 183
184 if(!myRfb.getCuiVersion()) 184 if(!myRfb.getCuiVersion())
185 presenter.successfulRfbConnection(); 185 presenter.successfulRfbConnection();
186 if (myRfb.hasViewer()) { 186 if (myRfb.hasViewer()) {
187 // hide VNC server's view to prevent video feed back. 187 System.out.println("start connection id:" + myRfb.getId() + " sharingId:" +myRfb.getSharingId());
188 // hide VNC server's view to prevent video feed back
188 boolean visibility = (myRfb.getSharingId() != myRfb.getId()); 189 boolean visibility = (myRfb.getSharingId() != myRfb.getId());
189 viewerWindow.setVisible(visibility); 190 if (visibility && myRfb.isTreeManager()) {
191 viewerWindow.setVisible(myRfb.getSharingId() != -1);
192 } else {
193 viewerWindow.setVisible(visibility);
194 }
190 if (previousViewerWindow != null) 195 if (previousViewerWindow != null)
191 previousViewerWindow.setVisible(false); 196 previousViewerWindow.setVisible(false);
192 viewerWindow.fitScreen(); 197 viewerWindow.fitScreen();
193 } 198 }
194 } 199 }