# HG changeset patch # User Shinji KONO # Date 1402624087 -32400 # Node ID 1291cf1122ca00ea5df3d4348f4e66dadadf61b0 # Parent 8d01028906c4ec442a7363773423b121a75a0f62 panel will not open ... diff -r 8d01028906c4 -r 1291cf1122ca src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java --- a/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java Fri Jun 13 10:09:11 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java Fri Jun 13 10:48:07 2014 +0900 @@ -13,6 +13,7 @@ private int portNumber = ConnectionParams.DEFAULT_VNC_ROOT; private MyRfbProto rfb; private String myHostName; + private Thread accThread; public CreateConnectionParam(MyRfbProto rfb) { this.rfb = rfb; @@ -44,7 +45,7 @@ public void runAcceptThread() { rfb.selectPort(ConnectionParams.DEFAULT_VNC_ROOT); AcceptThread acceptThread = new AcceptThread(rfb, rfb.getAcceptPort()); - Thread accThread = new Thread(acceptThread); + accThread = new Thread(acceptThread); accThread.start(); } @@ -67,4 +68,8 @@ public String getMyHostName() { return myHostName; } + + public Thread getAcceptThread() { + return accThread; + } } diff -r 8d01028906c4 -r 1291cf1122ca src/main/java/jp/ac/u_ryukyu/treevnc/client/TreeVncProtocol.java --- a/src/main/java/jp/ac/u_ryukyu/treevnc/client/TreeVncProtocol.java Fri Jun 13 10:09:11 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/client/TreeVncProtocol.java Fri Jun 13 10:48:07 2014 +0900 @@ -130,7 +130,8 @@ client.setTeminationType(true); client.closeApp(); client.setSocket(socket); - client.run(); + SwingUtilities.invokeLater(client); + // client.run(); } diff -r 8d01028906c4 -r 1291cf1122ca src/viewer_swing/java/com/glavsoft/viewer/Viewer.java --- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Fri Jun 13 10:09:11 2014 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Fri Jun 13 10:48:07 2014 +0900 @@ -298,7 +298,12 @@ settings.setViewOnly(true); // too avoid unnecessary upward traffic cp.createConnectionParam(this); rfb.setViewer(this); - SwingUtilities.invokeLater(this); + // SwingUtilities.invokeLater(this); + try { + Thread thr = cp.getAcceptThread(); + thr.join(); + } catch (InterruptedException e) { + } } /**