From 0ba4718fb7c0d4b8902640ff1714c34156079db5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laci=20b=C3=A1?= Date: Sat, 13 Nov 2021 23:52:49 +0100 Subject: [PATCH] Save config language entry as string instead of hex16 And remove some unnecessary stuff. --- src/config.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/config.c b/src/config.c index 499624f50..bb6427aaa 100644 --- a/src/config.c +++ b/src/config.c @@ -567,7 +567,11 @@ load_general(void) confirm_exit = config_get_int(cat, "confirm_exit", 1); confirm_save = config_get_int(cat, "confirm_save", 1); - lang_id = config_get_hex16(cat, "language", DEFAULT_LANGUAGE); + p = config_get_string(cat, "language", NULL); + if (p != NULL) + { + lang_id = plat_language_code(p); + } #if USE_DISCORD enable_discord = !!config_get_int(cat, "enable_discord", 0); @@ -1995,9 +1999,7 @@ config_load(void) cpu_f = (cpu_family_t *) &cpu_families[0]; cpu = 0; -#ifdef USE_LANGUAGE - plat_langid = 0x0409; -#endif + kbd_req_capture = 0; hide_status_bar = 0; scale = 1; @@ -2207,7 +2209,11 @@ save_general(void) if (lang_id == DEFAULT_LANGUAGE) config_delete_var(cat, "language"); else - config_set_hex16(cat, "language", lang_id); + { + char buffer[512] = {0}; + plat_language_code_r(lang_id, buffer, 511); + config_set_string(cat, "language", buffer); + } #if USE_DISCORD if (enable_discord)