Merge branch 'backport' into work

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index 142cf1f2fd1b44f45966f3a595f55f500480d2eb..d1c345abe4c3a3a449f3fcd1f8dc774e16e8e3f8 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -738,6 +738,11 @@ static void event_process(const XEvent *ec, gpointer data)
              e->type == MotionNotify)
         event_handle_user_input(client, e);
 
+    XFlush(obt_display);
+
+    /* run all the hooks at once */
+    hooks_run_queue();
+
     /* if something happens and it's not from an XEvent, then we don't know
        the time */
     event_curtime = CurrentTime;
@@ -1721,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;
             }