diff --git a/src/main/java/it/polimi/ingsw/gc14/View/GUI/GUI.java b/src/main/java/it/polimi/ingsw/gc14/View/GUI/GUI.java index 288aaaa..db4bfcb 100644 --- a/src/main/java/it/polimi/ingsw/gc14/View/GUI/GUI.java +++ b/src/main/java/it/polimi/ingsw/gc14/View/GUI/GUI.java @@ -29,7 +29,6 @@ public class GUI extends Application implements IView { FXMLLoader loaderMain; Scene mainScene; MainFXMLController controllerMain; - MiniModel miniModel; FXMLLoader loaderLeaderboard; Scene leaderboardScene; @@ -92,7 +91,8 @@ public class GUI extends Application implements IView { @Override public void setModel(MiniModel miniModel) { - this.miniModel=miniModel; + this.controller.setModel(miniModel); + } public void setController(ClientController controller) { @@ -103,7 +103,7 @@ public class GUI extends Application implements IView { Platform.runLater(() -> { boolean toFull=false; - synchronized (miniModel) { + synchronized (controller.miniModel) { if (controller.miniModel.currentState.getGameStage() == TOTEM_CHOICE) { if (primaryStage.getScene()!=leaderboardScene) { toFull=true; @@ -146,7 +146,7 @@ public class GUI extends Application implements IView { controllerLogin.showError(error); primaryStage.setFullScreen(true); }else { - synchronized (miniModel) { + synchronized (controller.miniModel) { controllerMain.isError = true; controllerMain.render();