Fix: after crash - new game

This commit is contained in:
2026-06-02 19:00:08 +02:00
parent 09c5537795
commit d41c2b2c51
2 changed files with 6 additions and 6 deletions
@@ -29,7 +29,7 @@ public class GUI extends Application implements IView {
FXMLLoader loaderMain; FXMLLoader loaderMain;
Scene mainScene; Scene mainScene;
MainFXMLController controllerMain; MainFXMLController controllerMain;
MiniModel miniModel;
FXMLLoader loaderLeaderboard; FXMLLoader loaderLeaderboard;
Scene leaderboardScene; Scene leaderboardScene;
LeaderboardFXMLController controllerLeaderboard; LeaderboardFXMLController controllerLeaderboard;
@@ -91,8 +91,7 @@ public class GUI extends Application implements IView {
@Override @Override
public void setModel(MiniModel miniModel) { public void setModel(MiniModel miniModel) {
this.controller.setModel(miniModel); this.miniModel=miniModel;
} }
public void setController(ClientController controller) { public void setController(ClientController controller) {
@@ -103,7 +102,7 @@ public class GUI extends Application implements IView {
Platform.runLater(() -> { Platform.runLater(() -> {
boolean toFull=false; boolean toFull=false;
synchronized (controller.miniModel) { synchronized (miniModel) {
if (controller.miniModel.currentState.getGameStage() == TOTEM_CHOICE) { if (controller.miniModel.currentState.getGameStage() == TOTEM_CHOICE) {
if (primaryStage.getScene()!=leaderboardScene) { if (primaryStage.getScene()!=leaderboardScene) {
toFull=true; toFull=true;
@@ -146,7 +145,7 @@ public class GUI extends Application implements IView {
controllerLogin.showError(error); controllerLogin.showError(error);
primaryStage.setFullScreen(true); primaryStage.setFullScreen(true);
}else { }else {
synchronized (controller.miniModel) { synchronized (miniModel) {
controllerMain.isError = true; controllerMain.isError = true;
controllerMain.render(); controllerMain.render();
@@ -111,7 +111,8 @@ public class MainFXMLController {
// ==== RENDER ==== // ==== RENDER ====
public void render() { public void render() {
if(foodLabels.isEmpty()) if(foodLabels.isEmpty() || controller.miniModel.lastEvent == null
|| controller.miniModel.lastEvent.getEventType().equals(EventType.TOTEM_CHOICE))
buildSidePanel(); buildSidePanel();
if(isError) if(isError)
{ {