X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fgui%2Fmenu.cpp;h=fd253e9beca49bd40746c3535ca6c137ce57ae66;hb=6492679a300bff2c17505c5d9bc9d333eeba384d;hp=e17764dc14b3609c53615ce4ea192cd98cb98e9f;hpb=752be71794ec11e68a12cc88548b43e3f9a6fc87;p=supertux.git

diff --git a/src/gui/menu.cpp b/src/gui/menu.cpp
index e17764dc1..fd253e9be 100644
--- a/src/gui/menu.cpp
+++ b/src/gui/menu.cpp
@@ -227,8 +227,9 @@ Menu::process_input()
      || controller->pressed(Controller::MENU_SELECT)) {
     menuaction = MENU_ACTION_HIT;
   }
-  if(controller->pressed(Controller::PAUSE_MENU)
-    || controller->pressed(Controller::MENU_BACK)) {
+  if(controller->pressed(Controller::ESCAPE) ||
+     controller->pressed(Controller::START) ||
+     controller->pressed(Controller::MENU_BACK)) {
     menuaction = MENU_ACTION_BACK;
   }
 
@@ -624,7 +625,7 @@ Menu::get_item_by_id(int id)
     }
   }
 
-  throw std::runtime_error("MenuItem not found");
+  throw std::runtime_error("MenuItem not found: " + std::to_string(id));
 }
 
 const MenuItem&