projects
/
profile
/
ivi
/
pulseaudio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bd63748
)
make pa_thread_mq_done() safe for subsequent calls
author
Janos Kovacs
<jankovac503@gmail.com>
Thu, 16 Aug 2012 00:47:48 +0000
(
03:47
+0300)
committer
Jaska Uimonen
<jaska.uimonen@intel.com>
Fri, 15 Feb 2013 07:39:56 +0000
(09:39 +0200)
src/pulsecore/thread-mq.c
patch
|
blob
|
history
diff --git
a/src/pulsecore/thread-mq.c
b/src/pulsecore/thread-mq.c
index
b492793
..
9efcd8a
100644
(file)
--- a/
src/pulsecore/thread-mq.c
+++ b/
src/pulsecore/thread-mq.c
@@
-97,6
+97,14
@@
void pa_thread_mq_init(pa_thread_mq *q, pa_mainloop_api *mainloop, pa_rtpoll *rt
void pa_thread_mq_done(pa_thread_mq *q) {
pa_assert(q);
+ if (!q->mainloop && !q->inq && !q->outq &&
+ !q->read_event && !q->write_event)
+ return;
+
+ pa_assert(q->mainloop);
+ pa_assert(q->inq && q->outq);
+ pa_assert(q->read_event && q->write_event);
+
/* Since we are called from main context we can be sure that the
* inq is empty. However, the outq might still contain messages
* for the main loop, which we need to dispatch (e.g. release