* UI: improved connects and disconnects processing:

 * fixed app freeze on broken server;
 * fixed app freeze on cancel button clicks;
 * fixed wrong still connected dialogs on app close or connect;
 * fixed missing wrong versions message;
 * improved error logs and messages.

Author: JayDi85

Mage.Client/src/main/java/mage/client/MageFrame.java

@@ -580,8 +580,10 @@ public static void setActive(MagePane frame) {
                 container.repaint();
             }
         } catch (InterruptedException e) {
-
+            LOGGER.fatal("MageFrame error", e);
+            Thread.currentThread().interrupt();
         }
+
         // Nothing to do
         if (activeFrame == frame) {
             return;
@@ -1403,22 +1405,24 @@ public void connected(final String message) {
     }
 
     @Override
-    public void disconnected(final boolean errorCall) {
+    public void disconnected(final boolean askToReconnect) {
         if (SwingUtilities.isEventDispatchThread()) { // Returns true if the current thread is an AWT event dispatching thread.
-            LOGGER.info("DISCONNECTED (Event Dispatch Thread)");
+            // REMOTE task, e.g. connecting
+            LOGGER.info("Disconnected from remote task");
             setConnectButtonText(NOT_CONNECTED_TEXT);
             disableButtons();
             hideGames();
             hideTables();
         } else {
-            LOGGER.info("DISCONNECTED (NO Event Dispatch Thread)");
+            // USER mode, e.g. user plays and got disconnect
+            LOGGER.info("Disconnected from user mode");
             SwingUtilities.invokeLater(() -> {
                         setConnectButtonText(NOT_CONNECTED_TEXT);
                         disableButtons();
                         hideGames();
                         hideTables();
                         SessionHandler.disconnect(false);
-                        if (errorCall) {
+                        if (askToReconnect) {
                             UserRequestMessage message = new UserRequestMessage("Connection lost", "The connection to server was lost. Reconnect?");
                             message.setButton1("No", null);
                             message.setButton2("Yes", PlayerAction.CLIENT_RECONNECT);

Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java

@@ -517,7 +517,6 @@ private void btnConnectActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FI
 
         char[] input = new char[0];
         try {
-            setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
             connection = new Connection();
             connection.setHost(this.txtServer.getText().trim());
             connection.setPort(Integer.valueOf(this.txtPort.getText().trim()));
@@ -545,6 +544,12 @@ private void btnConnectActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FI
 
     }//GEN-LAST:event_btnConnectActionPerformed
 
+    private void setConnectButtonsState(boolean enable) {
+        btnConnect.setEnabled(enable);
+        btnRegister.setEnabled(enable);
+        btnForgotPassword.setEnabled(enable);
+    }
+
     private class ConnectTask extends SwingWorker<Boolean, Void> {
 
         private boolean result = false;
@@ -555,7 +560,7 @@ private class ConnectTask extends SwingWorker<Boolean, Void> {
         @Override
         protected Boolean doInBackground() throws Exception {
             lblStatus.setText("Connecting...");
-            btnConnect.setEnabled(false);
+            setConnectButtonsState(false);
             result = MageFrame.connect(connection);
             lastConnectError = SessionHandler.getLastConnectError();
             return result;
@@ -565,7 +570,6 @@ protected Boolean doInBackground() throws Exception {
         protected void done() {
             try {
                 get(CONNECTION_TIMEOUT_MS, TimeUnit.MILLISECONDS);
-                setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
                 if (result) {
                     lblStatus.setText("");
                     connected();
@@ -578,13 +582,13 @@ protected void done() {
             } catch (ExecutionException ex) {
                 logger.fatal("Update Players Task error", ex);
             } catch (CancellationException ex) {
-                logger.info("Connect was canceled");
+                logger.info("Connect: canceled");
                 lblStatus.setText("Connect was canceled");
             } catch (TimeoutException ex) {
                 logger.fatal("Connection timeout: ", ex);
             } finally {
                 MageFrame.stopConnecting();
-                btnConnect.setEnabled(true);
+                setConnectButtonsState(true);
             }
         }
     }

Mage.Client/src/main/java/mage/client/dialog/MageDialog.java

@@ -109,6 +109,7 @@ public void setVisible(boolean value) {
                     SwingUtilities.invokeAndWait(() -> stopModal());
                 } catch (InterruptedException ex) {
                     LOGGER.fatal("MageDialog error", ex);
+                    Thread.currentThread().interrupt();
                 } catch (InvocationTargetException ex) {
                     LOGGER.fatal("MageDialog error", ex);
                 }
@@ -184,9 +185,10 @@ private synchronized void startModal() {
                     wait();
                 }
             }
-        } catch (InterruptedException ignored) {
+        } catch (InterruptedException e) {
+            LOGGER.fatal("MageDialog error", e);
+            Thread.currentThread().interrupt();
         }
-
     }
 
     private synchronized void stopModal() {

Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java

@@ -71,7 +71,7 @@ public void connected(String message) {
         }
 
         @Override
-        public void disconnected(boolean errorCall) {
+        public void disconnected(boolean askToReconnect) {
             logger.info("disconnected");
         }