don't try go to selected submenu when there is nothing selected

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index cfa3b4e39147b7f0dfca232798182842f3ac19b4..8a5720a54108996130b114012ada3bf3b65c5b81 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -709,6 +709,9 @@ static void event_process(const XEvent *ec, gpointer data)
         {
             used = event_handle_user_input(client, e);
 
+            if (prompt && !used)
+                used = event_handle_prompt(prompt, e);
+
             if (e->type == ButtonPress) {
                 pressed = e->xbutton.button;
                 pressed_win = e->xbutton.subwindow;
@@ -1859,7 +1862,8 @@ static gboolean event_handle_menu_input(XEvent *ev)
 
             else if (sym == XK_Right) {
                 /* Right goes to the selected submenu */
-                if (frame->selected->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU)
+                if (frame->selected &&
+                    frame->selected->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU)
                 {
                     /* make sure it is visible */
                     menu_frame_select(frame, frame->selected, TRUE);