summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-08-10 15:09:28 +0000
committerLennart Poettering <lennart@poettering.net>2007-08-10 15:09:28 +0000
commit72840abe8afca442645b00a54fbf7b31928024c0 (patch)
treebd8090103c2cd0424829501617ff4aadf0d8c4bd
parent357c0e415f027aaa306d9918bee8d7410ef91054 (diff)
minor cleanliness fixes
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1617 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--src/pulse/mainloop.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/pulse/mainloop.c b/src/pulse/mainloop.c
index eaa41d51..0563507d 100644
--- a/src/pulse/mainloop.c
+++ b/src/pulse/mainloop.c
@@ -305,6 +305,7 @@ static void mainloop_defer_free(pa_defer_event *e) {
if (e->enabled) {
assert(e->mainloop->n_enabled_defer_events > 0);
e->mainloop->n_enabled_defer_events--;
+ e->enabled = 0;
}
}
@@ -395,6 +396,7 @@ static void mainloop_time_free(pa_time_event *e) {
if (e->enabled) {
assert(e->mainloop->n_enabled_time_events > 0);
e->mainloop->n_enabled_time_events--;
+ e->enabled = 0;
}
if (e->mainloop->cached_next_time_event == e)
@@ -541,6 +543,7 @@ static void cleanup_time_events(pa_mainloop *m, int force) {
if (!e->dead && e->enabled) {
assert(m->n_enabled_time_events > 0);
m->n_enabled_time_events--;
+ e->enabled = 0;
}
if (e->destroy_callback)
@@ -574,9 +577,9 @@ static void cleanup_defer_events(pa_mainloop *m, int force) {
}
if (!e->dead && e->enabled) {
- e->enabled = 0;
assert(m->n_enabled_defer_events > 0);
m->n_enabled_defer_events--;
+ e->enabled = 0;
}
if (e->destroy_callback)