From 9b20ae4ad0134da79b5667be38a4c80c3a853540 Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Mon, 2 Oct 2017 20:45:38 +0200 Subject: [PATCH] Fixed #211 - close modal stage on connection error --- .../ui/controller/Controller.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/Controller.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/Controller.java index 80340b31b..a268d30c4 100644 --- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/Controller.java +++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/Controller.java @@ -544,6 +544,12 @@ public class Controller extends BaseController catch(Exception e1) { Logger.error(e1); + Platform.runLater(()->{ + if(modalStage != null) + { + modalStage.close(); + } + }); if(e1.getMessage().contains("404")) { @@ -553,12 +559,8 @@ public class Controller extends BaseController Localization.getString(Strings.TITLE_WARNING), "", Localization.getString(Strings.WARNING_SERVER_VERSION, Localization.getString(Strings.UNDEFINED), Localization.getString(Strings.VERSION_NAME)), - icon, getStage(), null, false); - - if(modalStage != null) - { - modalStage.close(); - }; + icon, getStage(), null, false); + categoryHandler = new CategoryHandler(null); toggleAllTabsExceptSettings(true); tabPane.getSelectionModel().select(tabSettings); -- GitLab