1 files changed, 7 insertions, 5 deletions
diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp
index 6b54405b..99459074 100644
--- a/khangman/khangman/khangman.cpp
+++ b/khangman/khangman/khangman.cpp
@@ -235,7 +235,6 @@ void KHangMan::setLanguages()
     // tdelibs/tdecore/all_languages to find the name of the country
     // corresponding to the code and the language the user set.
     TDEConfig entry(locate("locale", "all_languages"));
-    const TQStringList::ConstIterator itEnd = m_languages.end();
     for (TQStringList::Iterator it = m_languages.begin(); 
 	 it != m_languages.end(); ++it) {
         entry.setGroup(*it);
@@ -257,11 +256,14 @@ void KHangMan::setLanguages()
 
 void KHangMan::loadSettings()
 {
-    // Language //TODO is selectedLanguage necessary??? only used here
     selectedLanguage = Prefs::selectedLanguage();
-    if (m_languages.grep(selectedLanguage).isEmpty())
-            selectedLanguage = "en";
-    changeStatusbar(m_languageNames[m_languages.findIndex(Prefs::selectedLanguage())], IDS_LANG);
+    if (m_languages.contains(selectedLanguage) == 0)
+    {
+        selectedLanguage = "en";
+        m_view->khangman->slotChangeLanguage(m_view->khangman->m_languages.findIndex(selectedLanguage));
+        m_languageAction->setCurrentItem(m_languages.findIndex(selectedLanguage));
+    }
+    changeStatusbar(m_languageNames[m_languages.findIndex(selectedLanguage)], IDS_LANG);
     // Show/hide characters toolbar
     if (Prefs::showCharToolbar())
         secondToolbar->show();