From c77adf385e4fdbf65627df0ecbf73831d202893d Mon Sep 17 00:00:00 2001
From: Zhi You Tan <ryan_zhiyou@hotmail.com>
Date: Mon, 14 Aug 2017 11:21:33 +1200
Subject: [PATCH] Terminating client thread before server thread to prevent
 alert box popping up

---
 .../seng302/visualiser/ClientToServerThread.java   | 14 ++++++--------
 .../ClientToServerTests/RegularPacketsTest.java    |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/main/java/seng302/visualiser/ClientToServerThread.java b/src/main/java/seng302/visualiser/ClientToServerThread.java
index 2313ebb2..dc38e129 100644
--- a/src/main/java/seng302/visualiser/ClientToServerThread.java
+++ b/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();
-                    });
-                }
+                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;
             }
diff --git a/src/test/java/seng302/visualiser/ClientToServerTests/RegularPacketsTest.java b/src/test/java/seng302/visualiser/ClientToServerTests/RegularPacketsTest.java
index bf5fcab1..00824829 100644
--- a/src/test/java/seng302/visualiser/ClientToServerTests/RegularPacketsTest.java
+++ b/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.