aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Alexander Treuman <jat@spatialrift.net>2007-06-04 17:41:18 +0000
committerJ. Alexander Treuman <jat@spatialrift.net>2007-06-04 17:41:18 +0000
commit1b68d00b3bbf98f5677aa3bca383080920ab13e2 (patch)
tree02a116222e8721994256f1fdbb4e93d830f13983
parent652c2fc8b0ae2e081f5e94c5810365ead33e726e (diff)
downloadmpd-1b68d00b3bbf98f5677aa3bca383080920ab13e2.tar.gz
mpd-1b68d00b3bbf98f5677aa3bca383080920ab13e2.tar.xz
mpd-1b68d00b3bbf98f5677aa3bca383080920ab13e2.zip
Don't initialize zeroconf until after we've daemonized and log output has
been redirected. This prevents zeroconf from blocking daemonization, and makes sure any errors get sent to the logs and not stdout. git-svn-id: https://svn.musicpd.org/mpd/trunk@6477 09075e82-0dd4-0310-85a5-a0d7c8717e4f
-rw-r--r--src/main.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main.c b/src/main.c
index 4c537eb1d..ddfe508b6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -429,7 +429,6 @@ int main(int argc, char *argv[])
initAudioDriver();
initVolume();
initInterfaces();
- initZeroconf();
initReplayGainState();
initNormalization();
initInputStream();
@@ -438,10 +437,10 @@ int main(int argc, char *argv[])
setup_log_output(options.stdOutput);
-
-
initSigHandlers();
+ initZeroconf();
+
openVolumeDevice();
read_state_file();