summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2014-01-18 20:12:23 +0100
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2014-01-18 20:12:23 +0100
commit6c7044da80faeddbca85531b5789fd9137e31311 (patch)
tree3cb82da09c4a0b9428200c36299e285da0794949
parentadditional fix (diff)
downloadpyload-6c7044da80faeddbca85531b5789fd9137e31311.tar.xz
additional fix #2
-rw-r--r--pyload/DownloadManager.py3
-rw-r--r--pyload/threads/DecrypterThread.py2
2 files changed, 2 insertions, 3 deletions
diff --git a/pyload/DownloadManager.py b/pyload/DownloadManager.py
index 04c8d4467..6345f9519 100644
--- a/pyload/DownloadManager.py
+++ b/pyload/DownloadManager.py
@@ -72,7 +72,6 @@ class DownloadManager:
@lock
def stop(self, thread):
""" Removes a thread from all lists """
-
if thread in self.free:
self.free.remove(thread)
@@ -290,7 +289,7 @@ class DownloadManager:
occ = defaultdict(lambda: -1)
# decrypter are treated as occupied
for p in self.decrypter:
- progress = p.getProgressInfo()
+ progress = p.getProgress()
if progress:
occ[progress.plugin] = 0
diff --git a/pyload/threads/DecrypterThread.py b/pyload/threads/DecrypterThread.py
index 419f153a2..2e4560094 100644
--- a/pyload/threads/DecrypterThread.py
+++ b/pyload/threads/DecrypterThread.py
@@ -42,7 +42,7 @@ class DecrypterThread(BaseThread):
for p in packages:
self.m.core.api.addPackage(p.name, p.getURLs(), pack.password)
- self.finished()
+ self.m.done(self)
def decrypt(self, plugin_map, password=None, err=False):
result = []