mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge r2187 from prepare-0.9.10

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2203 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-03-31 22:07:17 +00:00
parent 79938c9f00
commit a8269372d3
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/daemon/main.c
View file

@ -779,7 +779,7 @@ int main(int argc, char *argv[]) {
c->disallow_module_loading = !!conf->disallow_module_loading; c->disallow_module_loading = !!conf->disallow_module_loading;
if (r < 0 && conf->fail) { if (r < 0 && conf->fail) {
pa_log("failed to initialize daemon."); pa_log("Failed to initialize daemon.");
#ifdef HAVE_FORK #ifdef HAVE_FORK
if (conf->daemonize) if (conf->daemonize)
pa_loop_write(daemon_pipe[1], &retval, sizeof(retval), NULL); pa_loop_write(daemon_pipe[1], &retval, sizeof(retval), NULL);
@ -793,16 +793,19 @@ int main(int argc, char *argv[]) {
} else { } else {
retval = 0; 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 #ifdef HAVE_FORK
if (conf->daemonize) if (conf->daemonize)
pa_loop_write(daemon_pipe[1], &retval, sizeof(retval), NULL); pa_loop_write(daemon_pipe[1], &retval, sizeof(retval), NULL);
#endif #endif
if (c->default_sink_name && if (!retval) {
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 {
pa_log_info("Daemon startup complete."); pa_log_info("Daemon startup complete.");
if (pa_mainloop_run(mainloop, &retval) < 0) if (pa_mainloop_run(mainloop, &retval) < 0)
retval = 1; retval = 1;