X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=65343e5c26fed69375c25b7ae8a2ac26880dc6ab;hp=701f827848b112b735e3fa16cae371934200e8a8;hb=2bd7df00a26bb0cb26283f56eef18659aaa65730;hpb=d9de75ccdc85fd9bf90c6eb9a1b42dfdd84afd32

diff --git a/audiod.c b/audiod.c
index 701f8278..65343e5c 100644
--- a/audiod.c
+++ b/audiod.c
@@ -144,6 +144,8 @@ void para_log(int ll, const char* fmt,...)
 
 	if (ll < conf.loglevel_arg)
 		return;
+	if (!logfile && conf.daemon_given)
+		return;
 	if (!hostname)
 		hostname = para_hostname();
 	outfd = logfile? logfile : stderr;
@@ -599,6 +601,8 @@ static void audiod_pre_select(struct sched *s, __a_unused struct task *t)
 		a = &afi[sl->format];
 		if (!sl->receiver_node)
 			continue;
+		if ((!a->num_filters || sl->fc) && sl->wng)
+			continue; /* everything already started */
 		if (!a->num_filters) {
 			if (sl->receiver_node->loaded && !sl->wng) {
 				open_writers(i);
@@ -611,7 +615,7 @@ static void audiod_pre_select(struct sched *s, __a_unused struct task *t)
 			s->timeout = min_delay;
 			continue;
 		}
-		if (!sl->fc || !*sl->fc->out_loaded || sl->wng)
+		if (sl->wng || !sl->fc || !*sl->fc->out_loaded)
 			continue;
 		if (tv_diff(now, &initial_delay_barrier, &diff) > 0) {
 			open_writers(i);