diff options
author | Kristian Høgsberg <krh@bitplanet.net> | 2011-10-29 14:27:33 -0400 |
---|---|---|
committer | Kristian Høgsberg <krh@bitplanet.net> | 2011-10-29 14:27:33 -0400 |
commit | f86338d611305fb84187298cbab5dfc78a698c99 (patch) | |
tree | 7e183f3582d7e691c8a517bcaa2b857b391eccbc | |
parent | 7e57dc143e0647502668753e9cd8d2a8582d4a6e (diff) |
event-loop: Fix idle handler dispatch corner case
When the last idle handler queues another idle handler, we fail to
dispatch that last handler. The wl_list_for_each_safe loop looks up
the next pointer before running the handler, and at that point it points
to the head of the list and the loop terminates.
Instead, just loop until the list is empty.
-rw-r--r-- | src/event-loop.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/event-loop.c b/src/event-loop.c index 5bd52fd..de1863a 100644 --- a/src/event-loop.c +++ b/src/event-loop.c @@ -434,9 +434,11 @@ post_dispatch_check(struct wl_event_loop *loop) static void dispatch_idle_sources(struct wl_event_loop *loop) { - struct wl_event_source_idle *source, *next; + struct wl_event_source_idle *source; - wl_list_for_each_safe(source, next, &loop->idle_list, base.link) { + while (!wl_list_empty(&loop->idle_list)) { + source = container_of(loop->idle_list.next, + struct wl_event_source_idle, base.link); source->func(source->base.data); wl_event_source_remove(&source->base); } |