From 22b4b66049b69211384ff0cac2c25a091880949f Mon Sep 17 00:00:00 2001
From: David Wu <zwu18@uclive.ac.nz>
Date: Wed, 13 Sep 2017 15:28:13 +1200
Subject: [PATCH] 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
---
 .../java/visualiser/Controllers/InGameLobbyController.java     | 3 ++-
 .../src/main/resources/visualiser/scenes/gameLobby.fxml        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java b/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
index 5a54f6ee..4c7a4686 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
@@ -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){};
         }
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml b/racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
index 367cfbf8..18658445 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
@@ -20,7 +20,7 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane fx:id="gameLobbyWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" style="-fx-background-color: rgba(100, 100, 100, 0.2);" visible="false" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.InGameLobbyController">
+<AnchorPane fx:id="gameLobbyWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" style="-fx-background-color: rgba(100, 100, 100, 0.2);" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.InGameLobbyController">
     <children>
       <GridPane style="-fx-background-color: rgba(0, 0, 0, 0.3);" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>