# HG changeset patch # User oc # Date 1402650987 -32400 # Node ID c3158d9e2c0bc54e9d2aab4599fb50cd1883ffdf # Parent e68dfd1972acb88d975e5980ac251198e661c4fc minor fix diff -r e68dfd1972ac -r c3158d9e2c0b src/main/java/jp/ac/u_ryukyu/treevnc/server/VncProxyService.java --- a/src/main/java/jp/ac/u_ryukyu/treevnc/server/VncProxyService.java Fri Jun 13 18:04:42 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/server/VncProxyService.java Fri Jun 13 18:16:27 2014 +0900 @@ -66,10 +66,10 @@ System.exit(0); } VncProxyService vps = new VncProxyService(); - vps.initProxy1("localhost"); + vps.initRoot("localhost"); } - private void initProxy1(String hostName) { + private void initRoot(String hostName) { myRfb = new MyRfbProtoProxy(); myRfb.setVncProxy(this); clients = new TreeManagement(hostName, vncport,myRfb); @@ -128,7 +128,7 @@ printUsage(parser.optionsUsage()); System.exit(0); } - initProxy1("localhost"); + initRoot("localhost"); } @Override diff -r e68dfd1972ac -r c3158d9e2c0b src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java --- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java Fri Jun 13 18:04:42 2014 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java Fri Jun 13 18:16:27 2014 +0900 @@ -120,9 +120,8 @@ viewerWindow = viewerWindowFactory.createViewerWindow(workingProtocol, rfbSettings, uiSettings, connectionString, presenter); if(myRfb.isRoot()) workingProtocol.startNormalHandling(this, viewerWindow.getSurface(), clipboardController, myRfb); - else if(myRfb instanceof MyRfbProtoClient) { + else if(!myRfb.isRoot()) { myRfb.setProtocolContext(workingProtocol); - myRfb.notProxy(); if(!myRfb.getCuiVersion()) workingProtocol.startTreeClientHandling(this, viewerWindow.getSurface(), clipboardController,myRfb); else