# HG changeset patch # User one # Date 1469441367 -32400 # Node ID fd803266ade7b230b250df709de5ad5ff3a7387b # Parent 8d636adb292cc1b59a02cb822b91d44c84bd66d6 Skip error dialog diff -r 8d636adb292c -r fd803266ade7 src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java --- a/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java Wed Jul 13 15:48:17 2016 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java Mon Jul 25 19:09:27 2016 +0900 @@ -179,6 +179,7 @@ public void connectionFailed() { cancelConnection(); + if (isTreeVNC) return; if (allowInteractive) { enableConnectionDialog(); } else { @@ -188,6 +189,7 @@ public void connectionCancelled() { cancelConnection(); + if (isTreeVNC) return; if (allowInteractive) { enableConnectionDialog(); } else { @@ -243,6 +245,7 @@ } public void showReconnectDialog(String errorTitle, String errorMessage) { + if (!isTreeVNC) return; final ConnectionView connectionView = (ConnectionView) getView(CONNECTION_VIEW); if (connectionView != null && needReconnection) { connectionView.showReconnectDialog(errorTitle, errorMessage); diff -r 8d636adb292c -r fd803266ade7 src/viewer_swing/java/com/glavsoft/viewer/Viewer.java --- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Wed Jul 13 15:48:17 2016 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Mon Jul 25 19:09:27 2016 +0900 @@ -350,7 +350,6 @@ final boolean hasJsch = checkJsch(); final boolean allowInteractive = allowAppletInteractiveConnections || ! isApplet; final ConnectionPresenter connectionPresenter = new ConnectionPresenter(hasJsch, allowInteractive); - connectionPresenter.setNoConnection(noConnection); ConnectionParams connectionParams = new ConnectionParams(); connectionParams.setConnectionParam(hostName, vncport); connectionPresenter.addModel("ConnectionParamsModel", connectionParams); diff -r 8d636adb292c -r fd803266ade7 src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java --- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java Wed Jul 13 15:48:17 2016 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java Mon Jul 25 19:09:27 2016 +0900 @@ -105,6 +105,7 @@ protected void done() { // EDT try { get(); + // throw new InterruptedException(); startVNCConnection(); } catch (CancellationException e) {