summaryrefslogtreecommitdiffstats
path: root/module/network/helper.py
diff options
context:
space:
mode:
Diffstat (limited to 'module/network/helper.py')
-rw-r--r--module/network/helper.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/module/network/helper.py b/module/network/helper.py
index dac0185ce..5ce21a8dd 100644
--- a/module/network/helper.py
+++ b/module/network/helper.py
@@ -72,7 +72,7 @@ class Deferred():
if not self.prgr.has_key(chain):
return
for f in self.prgr[chain]:
- callInThread(f, *args, **kwargs)
+ f(*args, **kwargs)
#decorator
def threaded(f):
@@ -92,7 +92,7 @@ def waitFor(d):
def wait(self):
self.d.addCallback(self.callb)
self.d.addErrback(self.errb)
- while self.waiting:
+ while self.waiting and not self.d.abort:
sleep(0.5)
if self.err:
#try: