projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Split Controller::PAUSE_MENU into ESCAPE and START, as they need to act different...
[supertux.git]
/
src
/
gui
/
dialog.cpp
diff --git
a/src/gui/dialog.cpp
b/src/gui/dialog.cpp
index
d489911
..
e536c9c
100644
(file)
--- a/
src/gui/dialog.cpp
+++ b/
src/gui/dialog.cpp
@@
-164,7
+164,8
@@
Dialog::process_input(const Controller& controller)
}
if (m_cancel_button != -1 &&
- controller.pressed(Controller::MENU_BACK))
+ (controller.pressed(Controller::ESCAPE) ||
+ controller.pressed(Controller::MENU_BACK)))
{
on_button_click(m_cancel_button);
}