Mercurial > hg > Applications > TreeVNC

changeset 467:fd803266ade7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Skip error dialog
author one
date Mon, 25 Jul 2016 19:09:27 +0900
parents 8d636adb292c
children f8a88cdb857b
files src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java src/viewer_swing/java/com/glavsoft/viewer/Viewer.java src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java
diffstat 3 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);
--- 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);
--- 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) {