summaryrefslogtreecommitdiffstats
path: root/pyLoadCore.py
diff options
context:
space:
mode:
authorGravatar mkaay <mkaay@mkaay.de> 2009-12-28 20:03:11 +0100
committerGravatar mkaay <mkaay@mkaay.de> 2009-12-28 20:03:11 +0100
commit035fd57b56b33463c933db15f4ee8a149ddc060f (patch)
tree0807370f16ce22c242626567bd3c1fa34327d4b9 /pyLoadCore.py
parentgui: easier package management (diff)
downloadpyload-035fd57b56b33463c933db15f4ee8a149ddc060f.tar.xz
tried to satisfy RaNaN
Diffstat (limited to 'pyLoadCore.py')
-rwxr-xr-xpyLoadCore.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/pyLoadCore.py b/pyLoadCore.py
index d0a6195d4..52cdf6720 100755
--- a/pyLoadCore.py
+++ b/pyLoadCore.py
@@ -152,7 +152,9 @@ class Core(object):
pid = found
lid = self.file_list.collector.addLink(linkFile)
self.file_list.packager.addFileToPackage(pid, self.file_list.collector.popFile(lid))
- self.file_list.packager.pushPackage2Queue(pid)
+ self.file_list.packager.pushPackage2Queue(pid)
+
+ self.file_list.continueAborted()
while True:
sleep(2)
@@ -322,9 +324,10 @@ class Core(object):
self.logger.info("shutting down...")
self.webserver.quit()
self.webserver.join()
- self.thread_list.stopAllDownloads()
for thread in self.thread_list.threads:
thread.shutdown = True
+ self.thread_list.stopAllDownloads()
+ for thread in self.thread_list.threads:
thread.join(15)
self.file_list.save()