summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--openbox/mainloop.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/openbox/mainloop.c b/openbox/mainloop.c
index 0e7b0b3c..36bba627 100644
--- a/openbox/mainloop.c
+++ b/openbox/mainloop.c
@@ -314,7 +314,7 @@ void ob_main_loop_run(ObMainLoop *loop)
ObMainLoopXHandlerType *h = it->data;
h->func(&e, h->data);
}
- } while (XPending(loop->display));
+ } while (XPending(loop->display) && loop->run);
} else if (loop->action_queue) {
/* only fire off one action at a time, then go back for more
X events, since the action might cause some X events (like
@@ -331,7 +331,7 @@ void ob_main_loop_run(ObMainLoop *loop)
action_unref(act);
act = NULL;
}
- } while (!act && loop->action_queue);
+ } while (!act && loop->action_queue && loop->run);
if (act) {
event_curtime = act->data.any.time;