[pulseaudio-commits] src/daemon

[Tanu Kaskinen]

 src/daemon/main.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 961a83a3fa2b2f98b37383f38b7a62a16e9cbe68
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Tue Mar 13 00:06:22 2012 +0100

    daemon: Initialize dbus to use thread-safe mode by default
    
    In most cases, we use dbus from more than one thread, as we
    e.g. enable real-time scheduling from the ALSA threads.
    Therefore set dbus to thread-safe mode by default, as recommended
    in https://bugs.freedesktop.org/show_bug.cgi?id=47060#c5
    
    This fixes a bug where PulseAudio could crash in two parallel
    calls to pa_make_realtime.
    
    BugLink: https://bugs.launchpad.net/bugs/937933
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>

diff --git a/src/daemon/main.c b/src/daemon/main.c
index 19933e3..da1e0cf 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -1066,6 +1066,8 @@ int main(int argc, char *argv[]) {
     buf = pa_strbuf_new();
 
 #ifdef HAVE_DBUS
+    pa_assert_se(dbus_threads_init_default());
+
     if (start_server) {
 #endif
         if (conf->load_default_script_file) {