From e6b0e569261bfa7534635df45dee3aa411d2e6fb Mon Sep 17 00:00:00 2001
From: waker <wakeroid@gmail.com>
Date: Sat, 21 May 2011 23:13:06 +0200
Subject: moved server_start to happen earlier, to prevent unwanted multiple
 instances

---
 main.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'main.c')

diff --git a/main.c b/main.c
index 2a3dae55..2a4d220e 100644
--- a/main.c
+++ b/main.c
@@ -821,6 +821,11 @@ main (int argc, char *argv[]) {
 //    }
     close(s);
 
+    // become a server
+    if (server_start () < 0) {
+        exit (-1);
+    }
+
     // hack: report nowplaying
     if (!strcmp (cmdline, "--nowplaying")) {
         char nothing[] = "nothing";
@@ -828,7 +833,6 @@ main (int argc, char *argv[]) {
         return 0;
     }
 
-
     pl_init ();
     conf_init ();
     conf_load (); // required by some plugins at startup
@@ -859,10 +863,6 @@ main (int argc, char *argv[]) {
         }
     }
 
-    // become a server
-    if (server_start () < 0) {
-        exit (-1);
-    }
 #if 0
     signal (SIGTERM, sigterm_handler);
     atexit (atexit_handler); // helps to save in simple cases
-- 
cgit v1.2.3