diff options
| -rw-r--r-- | java/com/tigervnc/vncviewer/CConn.java | 4 | ||||
| -rw-r--r-- | java/com/tigervnc/vncviewer/VncViewer.java | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/java/com/tigervnc/vncviewer/CConn.java b/java/com/tigervnc/vncviewer/CConn.java index 154a719c..714dff04 100644 --- a/java/com/tigervnc/vncviewer/CConn.java +++ b/java/com/tigervnc/vncviewer/CConn.java @@ -388,9 +388,7 @@ public class CConn extends CConnection setServerPort(port); sock = new TcpSocket(host, port); vlog.info("Redirected to "+host+":"+port); - setStreams(sock.inStream(), sock.outStream()); - sock.inStream().setBlockCallback(this); - initialiseProtocol(); + viewer.newViewer(viewer, sock, true); } catch (java.lang.Exception e) { throw new Exception(e.toString()); } diff --git a/java/com/tigervnc/vncviewer/VncViewer.java b/java/com/tigervnc/vncviewer/VncViewer.java index 26f41b62..799ee5d8 100644 --- a/java/com/tigervnc/vncviewer/VncViewer.java +++ b/java/com/tigervnc/vncviewer/VncViewer.java @@ -247,12 +247,18 @@ public class VncViewer extends java.applet.Applet implements Runnable firstApplet = true; } - public static void newViewer(VncViewer oldViewer, Socket sock) { + public static void newViewer(VncViewer oldViewer, Socket sock, boolean close) { VncViewer viewer = new VncViewer(); viewer.applet = oldViewer.applet; - viewer.firstApplet = false; + viewer.firstApplet = (close) ? true : false; viewer.sock = sock; viewer.start(); + if (close) + oldViewer.stop(); + } + + public static void newViewer(VncViewer oldViewer, Socket sock) { + newViewer(oldViewer, sock, false); } public static void newViewer(VncViewer oldViewer) { |