From 70e2b176d3e9d5598f909531fb30eb4cd9e36c08 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Thu, 7 Dec 2017 12:42:35 +0100
Subject: [PATCH] Fixed #236 - load alert is not modal while starting server
---
.../budgetmasterclient/ui/controller/Controller.java | 6 ++++--
.../ui/controller/LocalServerSettingsController.java | 7 ++++---
2 files changed, 8 insertions(+), 5 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 79a97e743..ecb4a9a2e 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
@@ -147,7 +147,7 @@ public class Controller extends BaseController
Logger.error(e);
}
}
- Worker.shutdown();
+ Worker.shutdown();
System.exit(0);
}
@@ -792,7 +792,9 @@ public class Controller extends BaseController
public void refresh(FilterSettings newFilterSettings)
{
- LoadingModal.showModal(Localization.getString(Strings.TITLE_MODAL), Localization.getString(Strings.LOAD_DATA), getStage(), icon);
+ Platform.runLater(()->{
+ LoadingModal.showModal(Localization.getString(Strings.TITLE_MODAL), Localization.getString(Strings.LOAD_DATA), getStage(), icon);
+ });
Worker.runLater(() -> {
try
diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/LocalServerSettingsController.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/LocalServerSettingsController.java
index 9a4e7bdc7..4be588d8c 100644
--- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/LocalServerSettingsController.java
+++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/LocalServerSettingsController.java
@@ -107,6 +107,7 @@ public class LocalServerSettingsController extends SettingsController
refreshLabelsUpdate();
prefill();
+ checkServerStatus();
}
@Override
@@ -131,8 +132,6 @@ public class LocalServerSettingsController extends SettingsController
}
checkboxEnableAutoUpdate.setSelected(controller.getSettings().isAutoUpdateCheckEnabled());
-
- checkServerStatus();
}
private void checkServerStatus()
@@ -147,7 +146,9 @@ public class LocalServerSettingsController extends SettingsController
save();
break;
case INACTIVE:
- LoadingModal.showModal(Localization.getString(Strings.TITLE_MODAL), Localization.getString(Strings.LOAD_LOCAL_SERVER), controller.getStage(), controller.getIcon());
+ Platform.runLater(()->{
+ LoadingModal.showModal(Localization.getString(Strings.TITLE_MODAL), Localization.getString(Strings.LOAD_LOCAL_SERVER), controller.getStage(), controller.getIcon());
+ });
labelLocalServerStatus.setText(Localization.getString(Strings.LOCAL_SERVER_STATUS_NOT_STARTED));
buttonLocalServerAction.setVisible(false);
Worker.runLater(() -> {
--
GitLab