set up the menu's parent and children stuff before rendering it

[chaz/openbox] / openbox / mainloop.c

diff --git a/openbox/mainloop.c b/openbox/mainloop.c
index 26ba4f9be633333e32c7d1424cd2ed0865c01f5e..e6914f89e8f446b26f71cf3eee0973163262a5f9 100644 (file)
--- a/openbox/mainloop.c
+++ b/openbox/mainloop.c
@@ -20,6 +20,7 @@
 #include "mainloop.h"
 #include "action.h"
 #include "client.h"
+#include "event.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -325,14 +326,16 @@ void ob_main_loop_run(ObMainLoop *loop)
                 {
                     loop->action_queue =
                         g_slist_delete_link(loop->action_queue,
-                                loop->action_queue);
+                                            loop->action_queue);
                     action_unref(act);
                     act = NULL;
                 }
             } while (!act && loop->action_queue);
 
             if  (act) {
+                event_curtime = act->data.any.time;
                 act->func(&act->data);
+                event_curtime = CurrentTime;
                 loop->action_queue =
                     g_slist_delete_link(loop->action_queue,
                                         loop->action_queue);
@@ -419,7 +422,7 @@ static void sighandler(gint sig)
                but throw some helpful output here... */
 
             fprintf(stderr, "How are you gentlemen? All your base are"
-                    " belong to us. (Signal=%d)\n", sig);
+                    " belong to us. (Openbox received signal %d)\n", sig);
 
             /* die with a core dump */
             abort();