summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-01-14 02:33:49 +0100
committerLennart Poettering <lennart@poettering.net>2010-01-14 02:33:49 +0100
commit93cb75d78ed82c40e525a8b30f1ead147ad35ead (patch)
tree66932fafd8aeb28c69b2305582688245043e22a6
parentacb4996203f6723d92a9b0df4e60db83c65116fc (diff)
daemon: first take name on the bus, then return in starter process
http://pulseaudio.org/ticket/748
-rw-r--r--src/daemon/main.c8
1 files changed, 4 insertions, 4 deletions
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;