diff options
| -rw-r--r-- | pyload/DownloadManager.py | 3 | ||||
| -rw-r--r-- | pyload/threads/DecrypterThread.py | 2 |
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 = [] |