diff --git a/client/src/main/java/ru/trader/controllers/MainController.java b/client/src/main/java/ru/trader/controllers/MainController.java index 5fe6ba5..1366113 100644 --- a/client/src/main/java/ru/trader/controllers/MainController.java +++ b/client/src/main/java/ru/trader/controllers/MainController.java @@ -310,6 +310,7 @@ public class MainController { if (world != null) world.getModeler().clear(); world = new MarketModel(World.getMarket()); market = world; + profile = world.getModeler().get(ModelFabric.get(profile)); Screeners.reinitAll(); } diff --git a/client/src/main/java/ru/trader/controllers/ProfileController.java b/client/src/main/java/ru/trader/controllers/ProfileController.java index 3a2fb28..e54dac4 100644 --- a/client/src/main/java/ru/trader/controllers/ProfileController.java +++ b/client/src/main/java/ru/trader/controllers/ProfileController.java @@ -9,7 +9,6 @@ import javafx.scene.Node; import javafx.scene.control.*; import javafx.scene.layout.Pane; import javafx.util.StringConverter; -import org.controlsfx.glyphfont.Glyph; import ru.trader.Main; import ru.trader.ServicesManager; import ru.trader.core.Engine; @@ -67,7 +66,6 @@ public class ProfileController { @FXML private void initialize() { init(); - profile = MainController.getProfile(); system.valueProperty().addListener((ov, o, n) -> { doAndConsumeChanges(() -> { station.setItems(n.getStationNamesList()); @@ -126,6 +124,7 @@ public class ProfileController { } void init(){ + profile = MainController.getProfile(); MarketModel world = MainController.getWorld(); world.getNotificator().add(marketChangeListener); SystemsProvider provider = world.getSystemsProvider();