Terminating client thread before server thread to prevent alert box popping up

src/main/java/seng302/visualiser/ClientToServerThread.java

@@ -157,14 +157,12 @@ public class ClientToServerThread implements Runnable {
             } catch (ByteReadException e) {
                 e.printStackTrace();
                 closeSocket();
-                if (Platform.isFxApplicationThread()) {
                 Platform.runLater(() -> {
                     Alert alert = new Alert(AlertType.ERROR);
                     alert.setHeaderText("Host has disconnected");
                     alert.setContentText("Cannot find Server");
                     alert.showAndWait();
                 });
-                }
                 clientLog(e.getMessage(), 1);
                 return;
             }

src/test/java/seng302/visualiser/ClientToServerTests/RegularPacketsTest.java

@@ -71,8 +71,8 @@ public class RegularPacketsTest {
 
     @After
     public void teardown () throws Exception {
-        serverThread.terminate();
         clientThread.setSocketToClose();
+        serverThread.terminate();
         GameState.setCurrentStage(GameStages.LOBBYING);
         for (int i = 0; i<20; i++)
             SleepThreadMaxDelay(); //Make sure socket is closed and toolkit remade.