From 93cb75d78ed82c40e525a8b30f1ead147ad35ead Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 14 Jan 2010 02:33:49 +0100
Subject: daemon: first take name on the bus, then return in starter process

http://pulseaudio.org/ticket/748
---
 src/daemon/main.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/daemon')

diff --git a/src/daemon/main.c b/src/daemon/main.c
index eafd72ac..c7e202a6 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -952,6 +952,10 @@ int main(int argc, char *argv[]) {
         goto finish;
     }
 
+#ifdef HAVE_DBUS
+    dbus = register_dbus(c);
+#endif
+
 #ifdef HAVE_FORK
     if (daemon_pipe[1] >= 0) {
         int ok = 0;
@@ -961,10 +965,6 @@ int main(int argc, char *argv[]) {
     }
 #endif
 
-#ifdef HAVE_DBUS
-    dbus = register_dbus(c);
-#endif
-
     pa_log_info(_("Daemon startup complete."));
 
     retval = 0;
-- 
cgit