--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java	Sat Dec 21 18:46:54 2013 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java	Tue Dec 31 09:13:07 2013 +0900
@@ -45,6 +45,7 @@
 import java.util.logging.Logger;
 
 import jp.ac.u_ryukyu.treevnc.MyRfbProto;
+import jp.ac.u_ryukyu.treevnc.client.MyRfbProtoClient;
 import jp.ac.u_ryukyu.treevnc.server.MyRfbProtoProxy;
 
 /**
@@ -116,8 +117,13 @@
                     workingProtocol, rfbSettings, uiSettings, connectionString, presenter);
             if(myRfb instanceof MyRfbProtoProxy)
             	workingProtocol.startNormalHandling(this, viewerWindow.getSurface(), clipboardController, myRfb);
-            else
+            else if(myRfb instanceof MyRfbProtoClient) {
+				myRfb.setProtocolContext(workingProtocol);
+				myRfb.notProxy();
+            	workingProtocol.startTreeClientHandling(this, viewerWindow.getSurface(), clipboardController,myRfb);
+            } else {
             	workingProtocol.startNormalHandling(this, viewerWindow.getSurface(), clipboardController);
+            }
             presenter.showMessage("Started");
 
             presenter.successfulRfbConnection();