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 @@ - +