diff --git a/src/de/deadlocker8/budgetmaster/main/Main.java b/src/de/deadlocker8/budgetmaster/main/Main.java index 71cbbd2de9b4e40e4b994f2f8a503f4bb0f78eaa..dae0e575449eeaeeeb81b9468cf49a253713f4e2 100644 --- a/src/de/deadlocker8/budgetmaster/main/Main.java +++ b/src/de/deadlocker8/budgetmaster/main/Main.java @@ -3,6 +3,8 @@ package de.deadlocker8.budgetmaster.main; import java.io.File; import java.util.Locale; +import de.deadlocker8.budgetmaster.logic.Settings; +import de.deadlocker8.budgetmaster.logic.utils.FileHelper; import de.deadlocker8.budgetmaster.logic.utils.Strings; import de.deadlocker8.budgetmaster.ui.controller.SplashScreenController; import javafx.application.Application; @@ -25,6 +27,13 @@ public class Main extends Application { primaryStage = stage; + //load correct language + Settings settings = FileHelper.loadSettings(); + if(settings.getLanguage() != null) + { + Localization.loadLanguage(settings.getLanguage().getLocale()); + } + try { Image icon = new Image("/de/deadlocker8/budgetmaster/resources/icon.png"); diff --git a/src/de/deadlocker8/budgetmaster/ui/controller/SplashScreenController.java b/src/de/deadlocker8/budgetmaster/ui/controller/SplashScreenController.java index 65bea18bd2166a6279557b026bbe606a576568e7..04920fa91c8d9a4222eda79d3099c706de3305b5 100644 --- a/src/de/deadlocker8/budgetmaster/ui/controller/SplashScreenController.java +++ b/src/de/deadlocker8/budgetmaster/ui/controller/SplashScreenController.java @@ -61,12 +61,7 @@ public class SplashScreenController } }); - settings = FileHelper.loadSettings(); - //load correct language - if(settings.getLanguage() != null) - { - Localization.loadLanguage(settings.getLanguage().getLocale()); - } + settings = FileHelper.loadSettings(); if(settings == null) {