#232: Changing from menu language no longer freezes level. Level restart is still...

SVN-Revision: 5585

diff --git a/src/gui/menu.hpp b/src/gui/menu.hpp
index 60d48dd..6aaeb3f 100644 (file)
--- a/src/gui/menu.hpp
+++ b/src/gui/menu.hpp
@@ -100,13 +100,13 @@ private:
   static Menu* previous;
   static Menu* current_;
 
-  static void pop_current();
-
 public:
   /** Set the current menu, if pmenu is NULL, hide the current menu */
   static void set_current(Menu* pmenu);
 
   static void push_current(Menu* pmenu);
+  static void pop_current();
+
 
   static void recalc_pos();
 

diff --git a/src/options_menu.cpp b/src/options_menu.cpp
index c947101..ccadc44 100644 (file)
--- a/src/options_menu.cpp
+++ b/src/options_menu.cpp
@@ -71,13 +71,13 @@ public:
       config->locale = "";
       dictionary_manager.set_language(config->locale);
       config->save();
-      Menu::set_current(0);
+      Menu::pop_current();
     }
     else if (item->id == 1) {
       config->locale = "en";
       dictionary_manager.set_language(config->locale);
       config->save();
-      Menu::set_current(0);
+      Menu::pop_current();
     }
     int mnid = 10;    
     std::set<std::string> languages = dictionary_manager.get_languages();
@@ -87,7 +87,7 @@ public:
         config->locale = locale_name;
         dictionary_manager.set_language(config->locale);
         config->save();
-        Menu::set_current(0);
+        Menu::pop_current();
       }
     }
   }