|
@@ -425,8 +425,6 @@ static void do_log(int log_level, const char *msg, va_list args, void *param)
|
|
|
|
|
|
bool OBSApp::InitGlobalConfigDefaults()
|
|
|
{
|
|
|
- config_set_default_string(globalConfig, "General", "Language",
|
|
|
- DEFAULT_LANG);
|
|
|
config_set_default_uint(globalConfig, "General", "MaxLogs", 10);
|
|
|
config_set_default_int(globalConfig, "General", "InfoIncrement", -1);
|
|
|
config_set_default_string(globalConfig, "General", "ProcessPriority",
|
|
@@ -832,8 +830,13 @@ bool OBSApp::InitGlobalConfig()
|
|
|
bool OBSApp::InitLocale()
|
|
|
{
|
|
|
ProfileScope("OBSApp::InitLocale");
|
|
|
+
|
|
|
const char *lang =
|
|
|
config_get_string(globalConfig, "General", "Language");
|
|
|
+ bool userLocale =
|
|
|
+ config_has_user_value(globalConfig, "General", "Language");
|
|
|
+ if (!userLocale || !lang || lang[0] == '\0')
|
|
|
+ lang = DEFAULT_LANG;
|
|
|
|
|
|
locale = lang;
|
|
|
|
|
@@ -855,8 +858,6 @@ bool OBSApp::InitLocale()
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
- bool userLocale =
|
|
|
- config_has_user_value(globalConfig, "General", "Language");
|
|
|
bool defaultLang = astrcmpi(lang, DEFAULT_LANG) == 0;
|
|
|
|
|
|
if (userLocale && defaultLang)
|