revert 7246 and simplify action_raiselower a bit, turns out 7246 wasn't needed for...

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index 3d58775b7222efbd7b10489c6ba8747ecedac648..ad146b4796edcae9eb85a432267c2dff07ccb83c 100644 (file)
--- 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))