mainloop fixes: when disabling time events when dispatching them, make sure to adjust the cache time event and enabled time event counters

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1153 fefdeb5f-60dc-0310-8127-8f9354f1896f

1 files changed, 6 insertions, 1 deletions

diff --git a/src/pulse/mainloop.c b/src/pulse/mainloop.c
index 682b2ccd..699c0ee7 100644
--- a/src/pulse/mainloop.c
+++ b/src/pulse/mainloop.c
@@ -766,7 +766,12 @@ static int dispatch_timeout(pa_mainloop *m) {
         if (pa_timeval_cmp(&e->timeval, &now) <= 0) {
             assert(e->callback);
 
-            e->enabled = 0;
+            /* Disable time event */
+            mainloop_time_restart(e, NULL);
+
+            if (m->cached_next_time_event == e)
+                m->cached_next_time_event = NULL;
+            
             e->callback(&m->api, e, &e->timeval, e->userdata);
 
             r++;