summaryrefslogtreecommitdiffstats
path: root/src/daemon
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-02-20 23:58:51 +0000
committerLennart Poettering <lennart@poettering.net>2006-02-20 23:58:51 +0000
commitcae2d8007650ac3bf9501177a389b69be7ae0eab (patch)
treed9b51774a0d814beefe16df1476c16da9d8e163f /src/daemon
parent1506c15a8ea8fd59bf97c5d41a0a99d59f86c656 (diff)
disable SIGPIPE before calling pa_core_new(), this way the warning message is not printed
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@542 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/daemon')
-rw-r--r--src/daemon/main.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/src/daemon/main.c b/src/daemon/main.c
index 638c2f3f..3124ad1d 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -357,6 +357,10 @@ int main(int argc, char *argv[]) {
valid_pid_file = 1;
}
+#ifdef SIGPIPE
+ signal(SIGPIPE, SIG_IGN);
+#endif
+
mainloop = pa_mainloop_new();
assert(mainloop);
@@ -367,17 +371,6 @@ int main(int argc, char *argv[]) {
assert(r == 0);
pa_signal_new(SIGINT, signal_callback, c);
pa_signal_new(SIGTERM, signal_callback, c);
-#ifdef SIGPIPE
- signal(SIGPIPE, SIG_IGN);
-#endif
-
-#ifdef OS_IS_WIN32
- defer = pa_mainloop_get_api(mainloop)->defer_new(pa_mainloop_get_api(mainloop), message_cb, NULL);
- assert(defer);
-#endif
-
- if (conf->daemonize)
- c->running_as_daemon = 1;
#ifdef SIGUSR1
pa_signal_new(SIGUSR1, signal_callback, c);
@@ -388,6 +381,14 @@ int main(int argc, char *argv[]) {
#ifdef SIGHUP
pa_signal_new(SIGHUP, signal_callback, c);
#endif
+
+#ifdef OS_IS_WIN32
+ defer = pa_mainloop_get_api(mainloop)->defer_new(pa_mainloop_get_api(mainloop), message_cb, NULL);
+ assert(defer);
+#endif
+
+ if (conf->daemonize)
+ c->running_as_daemon = 1;
oil_init();