X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=8a5720a54108996130b114012ada3bf3b65c5b81;hb=523a726c6c2f31da36a0af985d22f3792a8c09b5;hp=cfa3b4e39147b7f0dfca232798182842f3ac19b4;hpb=0d98c4fa7c29b9dec4da74380f4d0e695be53349;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index cfa3b4e3..8a5720a5 100644
--- 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);