X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=aa8fdda5425dae48dc6b47a8009795603bbefcd3;hp=1b3d724941802e0c1e5494e36c7cf01598a56e5a;hb=5b8e525dfb2f18a4e0d67b9da264259159ad2184;hpb=b88a9a0cbbb39e999ae4942ed596b17ce2ae7f23

diff --git a/server.c b/server.c
index 1b3d7249..aa8fdda5 100644
--- a/server.c
+++ b/server.c
@@ -77,12 +77,12 @@
 #include "vss.h"
 #include "config.h"
 #include "close_on_fork.h"
+#include "list.h"
 #include "send.h"
 #include "net.h"
 #include "daemon.h"
 #include "ipc.h"
 #include "fd.h"
-#include "list.h"
 #include "sched.h"
 #include "signal.h"
 #include "user_list.h"
@@ -399,11 +399,11 @@ static unsigned server_init(int argc, char **argv)
 	PARA_NOTICE_LOG("initializing audio format handlers\n");
 	afh_init();
 	PARA_NOTICE_LOG("initializing virtual streaming system\n");
-	vss_init();
 	mmd->server_pid = getpid();
 	setup_signal_handling();
 	PARA_NOTICE_LOG("initializing the audio file selector\n");
 	init_afs();
+	vss_init();
 	mmd_lock();
 	/* init network socket */
 	PARA_NOTICE_LOG("initializing tcp command socket\n");
@@ -480,8 +480,6 @@ repeat:
 	timeout = vss_preselect(&rfds, &wfds, &max_fileno);
 	status_refresh();
 	for (i = 0; senders[i].name; i++) {
-		if (senders[i].status != SENDER_ON)
-			continue;
 		if (!senders[i].pre_select)
 			continue;
 		senders[i].pre_select(&max_fileno, &rfds, &wfds);
@@ -493,8 +491,6 @@ repeat:
 	if (ret < 0)
 		goto repeat;
 	for (i = 0; senders[i].name; i++) {
-		if (senders[i].status != SENDER_ON)
-			continue;
 		if (!senders[i].post_select)
 			continue;
 		senders[i].post_select(&rfds, &wfds);