diff options
author | Lennart Poettering <lennart@poettering.net> | 2008-03-31 22:07:17 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2008-03-31 22:07:17 +0000 |
commit | a8269372d357bf393a2bb406ee83ae7ef62106f7 (patch) | |
tree | dc6895c465a7c8a44df4738461a0d2663ae36911 | |
parent | 79938c9f0039242805c9dd81e4b6b97c79047e34 (diff) |
merge r2187 from prepare-0.9.10
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2203 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r-- | src/daemon/main.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/daemon/main.c b/src/daemon/main.c index 678ee528..6b0c81da 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c @@ -779,7 +779,7 @@ int main(int argc, char *argv[]) { c->disallow_module_loading = !!conf->disallow_module_loading; if (r < 0 && conf->fail) { - pa_log("failed to initialize daemon."); + pa_log("Failed to initialize daemon."); #ifdef HAVE_FORK if (conf->daemonize) pa_loop_write(daemon_pipe[1], &retval, sizeof(retval), NULL); @@ -793,16 +793,19 @@ int main(int argc, char *argv[]) { } else { retval = 0; + + if (c->default_sink_name && + pa_namereg_get(c, c->default_sink_name, PA_NAMEREG_SINK, 1) == NULL) { + pa_log_error("%s : Default sink name (%s) does not exist in name register.", __FILE__, c->default_sink_name); + retval = !!conf->fail; + } + #ifdef HAVE_FORK if (conf->daemonize) pa_loop_write(daemon_pipe[1], &retval, sizeof(retval), NULL); #endif - if (c->default_sink_name && - pa_namereg_get(c, c->default_sink_name, PA_NAMEREG_SINK, 1) == NULL) { - pa_log_error("%s : Fatal error. Default sink name (%s) does not exist in name register.", __FILE__, c->default_sink_name); - retval = 1; - } else { + if (!retval) { pa_log_info("Daemon startup complete."); if (pa_mainloop_run(mainloop, &retval) < 0) retval = 1; |