From d1060ac5f38bfb292dc9e427062c9f96cea1f68f Mon Sep 17 00:00:00 2001
From: Nikolas Garofil <nikolas@garofil.be>
Date: Sat, 18 Aug 2012 18:11:27 +0200
Subject: [PATCH] Completed previous commit

Added some suggestions for the previous commit from Christophe Dumez
and made sure the argument directly after -d is looked at.
---
 src/main.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 27ea1bcb3..795c274bf 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -168,12 +168,9 @@ int main(int argc, char *argv[]) {
       for(int j=i; j<argc; j++) {
         argv[j] = argv[j+1];
       }
+      i--;
     }
   }
-  if(shouldDaemonize && daemon(1, 0) != 0) {
-    qCritical("Something went wrong while transforming into a daemon, exiting...");
-    return EXIT_FAILURE;
-  }
   QtSingleCoreApplication app("qBittorrent-"+uid, argc, argv);
 #else
   SessionApplication app("qBittorrent-"+uid, argc, argv);
@@ -202,6 +199,11 @@ int main(int argc, char *argv[]) {
   Preferences pref;
 #ifndef DISABLE_GUI
   bool no_splash = false;
+#else
+  if(shouldDaemonize && daemon(1, 0) != 0) {
+    qCritical("Something went wrong while transforming into a daemon, exiting...");
+    return EXIT_FAILURE;
+  }
 #endif
 
   // Load translation