summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-01-14 02:33:49 +0100
committerLennart Poettering <lennart@poettering.net>2010-02-21 17:53:24 +0100
commit83eb8afc5f9faaa4d17fce7dbde58b1863d9173c (patch)
treee6401dcbc971a41060c828825be04026abff299f /src
parentea29b11097b9d4180582924ca5df142fae4b6400 (diff)
daemon: first take name on the bus, then return in starter process
http://pulseaudio.org/ticket/748
Diffstat (limited to 'src')
-rw-r--r--src/daemon/main.c18
1 files changed, 9 insertions, 9 deletions
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;