From 83eb8afc5f9faaa4d17fce7dbde58b1863d9173c 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 | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/daemon/main.c b/src/daemon/main.c
index 5ccda779..9bea2aee 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -1027,15 +1027,6 @@ int main(int argc, char *argv[]) {
      * from now on, if requested */
     c->disallow_module_loading = !!conf->disallow_module_loading;
 
-#ifdef HAVE_FORK
-    if (daemon_pipe[1] >= 0) {
-        int ok = 0;
-        pa_loop_write(daemon_pipe[1], &ok, sizeof(ok), NULL);
-        pa_close(daemon_pipe[1]);
-        daemon_pipe[1] = -1;
-    }
-#endif
-
 #ifdef HAVE_DBUS
     if (!conf->system_instance) {
         if (!(server_lookup = pa_dbusobj_server_lookup_new(c)))
@@ -1048,6 +1039,15 @@ int main(int argc, char *argv[]) {
         goto finish;
 #endif
 
+#ifdef HAVE_FORK
+    if (daemon_pipe[1] >= 0) {
+        int ok = 0;
+        pa_loop_write(daemon_pipe[1], &ok, sizeof(ok), NULL);
+        pa_close(daemon_pipe[1]);
+        daemon_pipe[1] = -1;
+    }
+#endif
+
     pa_log_info(_("Daemon startup complete."));
 
     retval = 0;
-- 
cgit