26 lines
974 B
Diff
26 lines
974 B
Diff
From d03ffdccdb7286021e53876ba5d4adf9a1edd0d0 Mon Sep 17 00:00:00 2001
|
|
From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com>
|
|
Date: Sat, 15 Mar 2014 09:37:05 +0200
|
|
Subject: zeroconf-publish: Add locking around pa_mainloop_api_once()
|
|
|
|
Commit e1e154c7377779377fa1a36655a10effd693f7b5 added locking around
|
|
pa_mainloop_api_once() everywhere except pa__done(). This fixes that
|
|
omission.
|
|
|
|
diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c
|
|
index 0110e1d..35277c2 100644
|
|
--- a/src/modules/module-zeroconf-publish.c
|
|
+++ b/src/modules/module-zeroconf-publish.c
|
|
@@ -807,7 +807,9 @@ void pa__done(pa_module*m) {
|
|
if (!(u = m->userdata))
|
|
return;
|
|
|
|
+ pa_threaded_mainloop_lock(u->mainloop);
|
|
pa_mainloop_api_once(u->api, client_free, u);
|
|
+ pa_threaded_mainloop_unlock(u->mainloop);
|
|
pa_asyncmsgq_wait_for(u->thread_mq.outq, AVAHI_MESSAGE_SHUTDOWN_COMPLETE);
|
|
|
|
pa_threaded_mainloop_stop(u->mainloop);
|
|
--
|
|
cgit v0.10.2
|
|
|