Fix up error on quit. Fixes #95

matty-r · Feb 2, 2024 · a23f4bd · a23f4bd
1 parent bf6153e
commit a23f4bd
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/urChatBasic/backend/MessageHandler.java b/src/urChatBasic/backend/MessageHandler.java
@@ -817,10 +817,15 @@ public class DisconnectErrorMessage implements MessageBase
         @Override
         public void messageExec (Message myMessage)
         {
-            Constants.LOGGER.error(myMessage.getBody());
-            MessageDialog dialog = new MessageDialog("startUp() failed! " + myMessage.getBody(), "Error", JOptionPane.ERROR_MESSAGE);
-            dialog.setVisible(true);
-            // new DisconnectMessage().messageExec(myMessage);
+            // Are we just quitting, then don't show an error message.
+            if(myMessage.getBody().contains("Goodbye cruel world"))
+            {
+                gui.quitServer(myMessage.messageHandler.serverBase);
+            } else {
+                Constants.LOGGER.error(myMessage.getBody());
+                MessageDialog dialog = new MessageDialog("startUp() failed! " + myMessage.getBody(), "Error", JOptionPane.ERROR_MESSAGE);
+                dialog.setVisible(true);
+            }
         }
     }