Move language initialization to main method

hd-zero · Dec 3, 2024 · b92e47d · b92e47d
1 parent 9981119
commit b92e47d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/core/main.c b/src/core/main.c
@@ -11,6 +11,8 @@
 #include <lvgl/lvgl.h>
 #include <minIni.h>
 
+#include "lang/language.h"
+
 #ifdef EMULATOR_BUILD
 #include "SDLaccess.h"
 SDL_mutex *global_sdl_mutex;
@@ -155,6 +157,7 @@ int main(int argc, char *argv[]) {
     // 1. Recall configuration
     settings_init();
     settings_load();
+    language_init();
     vclk_phase_init();
 
     // 2. Initialize communications.

diff --git a/src/core/settings.c b/src/core/settings.c
@@ -464,8 +464,6 @@ void settings_load(void) {
         g_setting.language.lang = ini_getl("language", "lang", g_setting_defaults.language.lang, SETTING_INI);
     }
 
-    language_init();
-
     // Check
     if (fs_file_exists(SELF_TEST_FILE)) {
         unlink(SELF_TEST_FILE);