diff options
author | Lennart Poettering <lennart@poettering.net> | 2008-05-15 23:34:41 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2008-05-15 23:34:41 +0000 |
commit | 045c1d602dcba57868845ba3270510593c39480f (patch) | |
tree | b3d61f180e6fa40f97a80aa3e46d7c910ed7c2a6 /src/pulse/subscribe.c | |
parent | 91f092eadcc5e9075e04ae42df11de28ef5047a8 (diff) |
merge glitch-free branch back into trunk
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2445 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/pulse/subscribe.c')
-rw-r--r-- | src/pulse/subscribe.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/pulse/subscribe.c b/src/pulse/subscribe.c index 580038cc..0c5686b7 100644 --- a/src/pulse/subscribe.c +++ b/src/pulse/subscribe.c @@ -27,7 +27,8 @@ #include <stdio.h> -#include <pulsecore/gccmacro.h> +#include <pulse/gccmacro.h> + #include <pulsecore/macro.h> #include <pulsecore/pstream-util.h> @@ -87,6 +88,9 @@ void pa_context_set_subscribe_callback(pa_context *c, pa_context_subscribe_cb_t pa_assert(c); pa_assert(PA_REFCNT_VALUE(c) >= 1); + if (c->state == PA_CONTEXT_TERMINATED || c->state == PA_CONTEXT_FAILED) + return; + c->subscribe_callback = cb; c->subscribe_userdata = userdata; } |