summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--openbox/event.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/openbox/event.c b/openbox/event.c
index 3d58775b..ad146b47 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1584,13 +1584,8 @@ static gboolean event_handle_menu_keyboard(XEvent *ev)
if (frame == NULL)
ret = FALSE;
- else if (keycode == ob_keycode(OB_KEY_ESCAPE) && state == 0) {
- /* Escape goes to the parent menu or closes the last one */
- if (frame->parent)
- menu_frame_select(frame, NULL, TRUE);
- else
- menu_frame_hide_all();
- }
+ else if (keycode == ob_keycode(OB_KEY_ESCAPE) && state == 0)
+ menu_frame_hide_all();
else if (keycode == ob_keycode(OB_KEY_RETURN) && (state == 0 ||
state == ControlMask))