From b92e47d76fe388242a1d6ec51efa9393bb278e0b Mon Sep 17 00:00:00 2001 From: Master92 Date: Tue, 3 Dec 2024 09:26:50 +0100 Subject: [PATCH] Move language initialization to main method --- src/core/main.c | 3 +++ src/core/settings.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/core/main.c b/src/core/main.c index 8f30c062..fb22e9ca 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -11,6 +11,8 @@ #include #include +#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 index b0e60015..1460f67c 100644 --- 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);