From 19a2ae45e916131d8865150b1315759eddfd4aef Mon Sep 17 00:00:00 2001
From: Andrew Resch <andrewresch@gmail.com>
Date: Thu, 10 Jul 2008 03:42:43 +0000
Subject: [PATCH] Try to fix daemon starting in windows

---
 deluge/main.py                       | 8 ++++++++
 deluge/ui/gtkui/connectionmanager.py | 7 ++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/deluge/main.py b/deluge/main.py
index ae4f27bc0..9e6591928 100644
--- a/deluge/main.py
+++ b/deluge/main.py
@@ -124,6 +124,14 @@ def start_daemon():
         else:
             os._exit(0)
     
+    if deluge.common.windows_check() and not options.donot:
+        port = 58846
+        if options.port:
+            port = options.port
+        import subprocess
+        subprocess.Popen(["deluged", "-p %s" % port])
+        os._exit(0)
+        
     from deluge.core.daemon import Daemon
     Daemon(options, args)
 
diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py
index 009b5384c..ac8be1b3f 100644
--- a/deluge/ui/gtkui/connectionmanager.py
+++ b/deluge/ui/gtkui/connectionmanager.py
@@ -36,6 +36,7 @@ import pkg_resources
 import gobject
 import socket
 import os
+import subprocess
 import time
 import threading
 
@@ -120,7 +121,7 @@ class ConnectionManager(component.Component):
         # If classic mode is set, we just start up a localhost daemon and connect to it
         if self.gtkui_config["classic_mode"]:
             uri = "http://localhost:58846"
-            os.spawnlp(os.P_NOWAIT, "deluged", "-p", "58846")
+            subprocess.Popen(["deluged", "-p 58846"])
             time.sleep(0.1)
             # We need to wait for the host to start before connecting
             while not self.test_online_status(uri):
@@ -152,7 +153,7 @@ class ConnectionManager(component.Component):
                     port = uri[7:].split(":")[1]
                     # First add it to the list
                     self.add_host("localhost", port)
-                    os.spawnlp(os.P_NOWAIT, "deluged", "-p", port)
+                    subprocess.Popen(["deluged", "-p %s" % port])
                     # We need to wait for the host to start before connecting
                     while not self.test_online_status(uri):
                         time.sleep(0.01)
@@ -424,7 +425,7 @@ class ConnectionManager(component.Component):
         port = str(port)
         log.info("Starting localhost:%s daemon..", port)
         # Spawn a local daemon
-        os.spawnlp(os.P_NOWAIT, "deluged", "-p", port)
+        subprocess.Popen(["deluged", "-p %s" % port])
         
     def on_button_close_clicked(self, widget):
         log.debug("on_button_close_clicked")