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
2017-09-13 16:14:07 +12:00
parent fd120edaf9
commit e4dbebfcac
2 changed files with 4 additions and 1 deletions
@@ -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;
@@ -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){};