From e4dbebfcac158f1ee8e452179fcad5899f91afc7 Mon Sep 17 00:00:00 2001
From: hba56 <hba56@uclive.ac.nz>
Date: Wed, 13 Sep 2017 16:14:07 +1200
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/master' into
 story77

# Conflicts:
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
#	racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
#	racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
#	racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
#	racevisionGame/src/main/java/visualiser/app/App.java
#	settings/keyBindings.xml
---
 racevisionGame/src/main/java/mock/app/Event.java              | 1 +
 .../java/visualiser/Controllers/InGameLobbyController.java    | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/racevisionGame/src/main/java/mock/app/Event.java b/racevisionGame/src/main/java/mock/app/Event.java
index b9514002..f9c47988 100644
--- a/racevisionGame/src/main/java/mock/app/Event.java
+++ b/racevisionGame/src/main/java/mock/app/Event.java
@@ -7,6 +7,7 @@ import mock.model.Polars;
 import mock.model.RaceLogic;
 import mock.model.SourceIdAllocator;
 import mock.model.commandFactory.CompositeCommand;
+import mock.xml.RaceXMLCreator;
 import network.Messages.Enums.RaceStatusEnum;
 import network.Messages.HostGame;
 import mock.model.wind.RandomWindGenerator;
diff --git a/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java b/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
index 4c7a4686..b2076875 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
@@ -294,7 +294,9 @@ public class InGameLobbyController extends Controller {
             visualiserRaceEvent.terminate();
 
             try{
-                App.game.endEvent();
+                if(isHost) {
+                    App.game.endEvent();
+                }
                 loadScene("title.fxml");
 
             }catch (IOException ignore){};