Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77

# Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java # racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
2017-09-13 15:28:13 +12:00
parent cccce9002b
commit 22b4b66049
2 changed files with 3 additions and 2 deletions
@@ -19,6 +19,7 @@ import javafx.scene.shape.MeshView;
 import mock.app.Event;
 import network.Messages.Enums.RaceStatusEnum;
 import network.Messages.Enums.RequestToJoinEnum;
+import visualiser.app.App;
 import visualiser.gameController.ControllerClient;
 import visualiser.layout.SeaSurface;
 import visualiser.layout.Subject3D;
@@ -293,8 +294,8 @@ public class InGameLobbyController extends Controller {
            visualiserRaceEvent.terminate();

            try{
+                App.game.endEvent();
                loadScene("title.fxml");
-                gameLobbyWrapper.setVisible(false);

            }catch (IOException ignore){};
        }