Merge branch 'backport' into work

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index 2563be2b62c8fae4772b18d7245b5935c395daff..d1c345abe4c3a3a449f3fcd1f8dc774e16e8e3f8 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1726,7 +1726,8 @@ static gboolean event_handle_menu_input(XEvent *ev)
 
             else if (keycode == ob_keycode(OB_KEY_LEFT)) {
                 /* Left goes to the parent menu */
-                menu_frame_select(frame, NULL, TRUE);
+                if (frame->parent)
+                    menu_frame_select(frame, NULL, TRUE);
                 ret = TRUE;
             }