From d6a547c6831c39396da38a6bc6c46df84842dc8c Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Tue, 7 Nov 2017 17:37:44 +0100 Subject: [PATCH] Fixed #226 - can't start if settings are created from default --- .../ui/controller/SplashScreenController.java | 2 ++ BudgetMasterServer/.classpath | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/SplashScreenController.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/SplashScreenController.java index 28071b535..930e2539f 100644 --- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/SplashScreenController.java +++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/SplashScreenController.java @@ -6,6 +6,7 @@ import de.deadlocker8.budgetmaster.logic.Settings; import de.deadlocker8.budgetmaster.logic.utils.Colors; import de.deadlocker8.budgetmaster.logic.utils.FileHelper; import de.deadlocker8.budgetmaster.logic.utils.Helpers; +import de.deadlocker8.budgetmaster.logic.utils.LanguageType; import de.deadlocker8.budgetmaster.logic.utils.Strings; import de.deadlocker8.budgetmasterclient.ui.Styleable; import de.deadlocker8.budgetmasterclient.ui.customAlert.CustomAlertController; @@ -97,6 +98,7 @@ public class SplashScreenController extends BaseController implements Styleable if(settings == null) { settings = new Settings(); + settings.setLanguage(LanguageType.ENGLISH); //first start of budgetmaster Platform.runLater(() -> { AlertGenerator.showAlert(AlertType.INFORMATION, diff --git a/BudgetMasterServer/.classpath b/BudgetMasterServer/.classpath index fae1a2b37..8e795b1c7 100644 --- a/BudgetMasterServer/.classpath +++ b/BudgetMasterServer/.classpath @@ -22,7 +22,7 @@ <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <attributes> <attribute name="maven.pomderived" value="true"/> </attributes> -- GitLab