X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgui%2Fmenu.cpp;h=361173c06b8d3c9f5744d8fb35dc4cc0b1454983;hb=717f10b21efba0b9b3dcd844df219c652a18797a;hp=88fffd57b70538989056fc20bf3665d77edcbbc5;hpb=c0093d25093395cb62fc2526ab42be65a9f015b8;p=supertux.git

diff --git a/src/gui/menu.cpp b/src/gui/menu.cpp
index 88fffd57b..361173c06 100644
--- a/src/gui/menu.cpp
+++ b/src/gui/menu.cpp
@@ -139,6 +139,8 @@ Menu::pop_current()
     current_->effect.start(500);
 
     last_menus.pop_back();
+  } else {
+    current_ = 0;
   }
 }
 
@@ -818,12 +820,11 @@ Menu::event(const SDL_Event& event)
 void
 Menu::set_active_item(int id)
 {
-	for(int i = 0; i < items.size(); ++i) {
-		MenuItem* item = items[i];
-		if(item->id == id) {
-			active_item = i;
-			break;
-		}
-	}
+  for(size_t i = 0; i < items.size(); ++i) {
+    MenuItem* item = items[i];
+    if(item->id == id) {
+      active_item = i;
+      break;
+    }
+  }
 }
-