Determine language on start-up if language is set to auto detect.

[supertux.git] / src / supertux / menu / language_menu.cpp

diff --git a/src/supertux/menu/language_menu.cpp b/src/supertux/menu/language_menu.cpp
index 136a284..fab8544 100644 (file)
--- a/src/supertux/menu/language_menu.cpp
+++ b/src/supertux/menu/language_menu.cpp
@@ -56,11 +56,11 @@ LanguageMenu::menu_action(MenuItem* item)
   {
     FL_Locale *locale;
     FL_FindLocale(&locale, FL_MESSAGES);
-    tinygettext::Language language = tinygettext::Language::from_spec(locale->lang, locale->country, locale->variant);
+    tinygettext::Language language = tinygettext::Language::from_spec( locale->lang?locale->lang:"", locale->country?locale->country:"", locale->variant?locale->variant:"");
     FL_FreeLocale(&locale);
 
-    dictionary_manager->set_language(language);
-    g_config->locale = language.str();
+    dictionary_manager->set_language(language); // set currently detected language
+    g_config->locale = ""; // do auto detect every time on startup
     g_config->save();
     MenuManager::pop_current();
   }