summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Resch <andrewresch@gmail.com>2009-04-14 20:40:29 +0000
committerAndrew Resch <andrewresch@gmail.com>2009-04-14 20:40:29 +0000
commit4a22de279b65e7840cfebdd256e669d5d1a81868 (patch)
tree3c96f2c58e946cf1a18f641759e7c36379b9910c
parentd742f394f007d813f050fcf41c9aaf4a3b2d20c5 (diff)
downloaddeluge-4a22de279b65e7840cfebdd256e669d5d1a81868.tar.gz
deluge-4a22de279b65e7840cfebdd256e669d5d1a81868.tar.bz2
deluge-4a22de279b65e7840cfebdd256e669d5d1a81868.zip
Fix starting the daemon in OS X
-rw-r--r--ChangeLog1
-rw-r--r--deluge/ui/gtkui/connectionmanager.py3
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9da422650..1e7272965 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
* Fix #883 segfault if locale is not using UTF-8 encoding
* Fix for adding torrents with invalid filename encodings
* Fix displaying IPv6 peers in the Peers tab
+ * Fix starting the daemon in OS X
=== Deluge 1.1.6 - (06 April 2009) ===
==== Core ====
diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py
index c3ec0a2d0..87360393f 100644
--- a/deluge/ui/gtkui/connectionmanager.py
+++ b/deluge/ui/gtkui/connectionmanager.py
@@ -491,6 +491,9 @@ class ConnectionManager(component.Component):
# Spawn a local daemon
if deluge.common.windows_check():
win32api.WinExec("deluged -p %s" % port)
+ elif deluge.common.osx_check():
+ subprocess.call(["nohup", "deluged", "--port=%s" % port,
+ "--config=%s" % deluge.configmanager.get_config_dir()])
else:
subprocess.call(["deluged", "--port=%s" % port,
"--config=%s" % deluge.configmanager.get_config_dir()])