Fix Win32 connection manager hanging when starting new windowsless daemon
This commit is contained in:
parent
827b53792b
commit
ba4ca111c6
|
@ -41,16 +41,12 @@ except ImportError:
|
||||||
import deluge.rencode as rencode
|
import deluge.rencode as rencode
|
||||||
|
|
||||||
import zlib
|
import zlib
|
||||||
|
import subprocess
|
||||||
|
|
||||||
import deluge.common
|
import deluge.common
|
||||||
import deluge.component as component
|
import deluge.component as component
|
||||||
from deluge.log import LOG as log
|
from deluge.log import LOG as log
|
||||||
|
|
||||||
if deluge.common.windows_check():
|
|
||||||
import win32api
|
|
||||||
else:
|
|
||||||
import subprocess
|
|
||||||
|
|
||||||
RPC_RESPONSE = 1
|
RPC_RESPONSE = 1
|
||||||
RPC_ERROR = 2
|
RPC_ERROR = 2
|
||||||
RPC_EVENT = 3
|
RPC_EVENT = 3
|
||||||
|
@ -579,7 +575,7 @@ class Client(object):
|
||||||
"""
|
"""
|
||||||
try:
|
try:
|
||||||
if deluge.common.windows_check():
|
if deluge.common.windows_check():
|
||||||
win32api.WinExec("deluged --port=%s --config=\"%s\"" % (port, config))
|
subprocess.Popen(["deluged", "--port=%s" % port, "--config=%s" % config])
|
||||||
elif deluge.common.osx_check():
|
elif deluge.common.osx_check():
|
||||||
subprocess.call(["nohup", "deluged", "--port=%s" % port, "--config=%s" % config])
|
subprocess.call(["nohup", "deluged", "--port=%s" % port, "--config=%s" % config])
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Reference in New Issue