- Fixed Null Pointer

- Build Should pass

Tags: #story[1245]

src/main/java/seng302/visualiser/GameClient.java

@@ -341,10 +341,10 @@ public class GameClient {
             }
 
             if (raceFinished) {
-                System.out.println(raceViewController);
                 raceViewController.showFinishDialog(finishedBoats);
                 Sounds.playFinishSound();
                 close();
+                ViewManager.getInstance().getGameClient().stopGame();
                 //loadFinishScreenView();
             }
             raceState.setRaceFinished();
@@ -450,7 +450,7 @@ public class GameClient {
         if (server != null) server.terminate();
         if (socketThread != null) socketThread.setSocketToClose();
         server = null;
-        socketThread = null;
+//        socketThread = null;
     }
 
     public Map<Integer, ClientYacht> getAllBoatsMap() {

src/main/java/seng302/visualiser/controllers/RaceViewController.java

@@ -200,7 +200,6 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     public void showFinishDialog(ArrayList<ClientYacht> finishedBoats) {
         raceState.setRaceStarted(false);
         finishDialogController.setFinishedBoats(finishedBoats);
-        ViewManager.getInstance().getGameClient().stopGame();
         finishScreenDialog.show();
     }