diff options
| author | Thierry Crozat | 2017-03-09 22:27:45 +0000 |
|---|---|---|
| committer | GitHub | 2017-03-09 22:27:45 +0000 |
| commit | 8726792ae6cb3db94de9302bb9f41e808fdcdf7f (patch) | |
| tree | 3b47778a37559d584d31c6ef50a4991e75633e94 /gui/options.cpp | |
| parent | 0c5ad902dc298e0c5a1442a9c9ecc0adde62114c (diff) | |
| parent | f39412fcec6ae9310b0587df6b4a5e6a5b5ab427 (diff) | |
| download | scummvm-rg350-8726792ae6cb3db94de9302bb9f41e808fdcdf7f.tar.gz scummvm-rg350-8726792ae6cb3db94de9302bb9f41e808fdcdf7f.tar.bz2 scummvm-rg350-8726792ae6cb3db94de9302bb9f41e808fdcdf7f.zip | |
Merge pull request #919 from Joefish/master
GUI: Fix for #9711
Diffstat (limited to 'gui/options.cpp')
| -rw-r--r-- | gui/options.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/gui/options.cpp b/gui/options.cpp index 5b62d493c4..7a22a9ba3f 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -1838,24 +1838,6 @@ void GlobalOptionsDialog::apply() { g_gui.loadNewTheme(g_gui.theme()->getThemeId(), selected); ConfMan.set("gui_renderer", cfg, _domain); } -#ifdef USE_TRANSLATION - Common::String oldLang = ConfMan.get("gui_language"); - int selLang = _guiLanguagePopUp->getSelectedTag(); - - ConfMan.set("gui_language", TransMan.getLangById(selLang)); - - Common::String newLang = ConfMan.get("gui_language").c_str(); - if (newLang != oldLang) { - // Activate the selected language - TransMan.setLanguage(selLang); - - // Rebuild the Launcher and Options dialogs - g_gui.loadNewTheme(g_gui.theme()->getThemeId(), ThemeEngine::kGfxDisabled, true); - rebuild(); - if (_launcher != 0) - _launcher->rebuild(); - } -#endif // USE_TRANSLATION #ifdef USE_UPDATES ConfMan.setInt("updates_check", _updatesPopUp->getSelectedTag()); @@ -1926,6 +1908,24 @@ void GlobalOptionsDialog::apply() { draw(); _newTheme.clear(); } +#ifdef USE_TRANSLATION + Common::String oldLang = ConfMan.get("gui_language"); + int selLang = _guiLanguagePopUp->getSelectedTag(); + + ConfMan.set("gui_language", TransMan.getLangById(selLang)); + + Common::String newLang = ConfMan.get("gui_language").c_str(); + if (newLang != oldLang) { + // Activate the selected language + TransMan.setLanguage(selLang); + + // Rebuild the Launcher and Options dialogs + g_gui.loadNewTheme(g_gui.theme()->getThemeId(), ThemeEngine::kGfxDisabled, true); + rebuild(); + if (_launcher != 0) + _launcher->rebuild(); + } +#endif // USE_TRANSLATION OptionsDialog::apply(); } |