summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Jeix <devnull@localhost> 2010-10-30 22:45:19 +0200
committerGravatar Jeix <devnull@localhost> 2010-10-30 22:45:19 +0200
commita8e03d722e08f713f1bd78a8c086a42db40f380c (patch)
treee1cf04dbf370c33e2f0834275136c509b5a31286
parentclosed #168 (diff)
downloadpyload-a8e03d722e08f713f1bd78a8c086a42db40f380c.tar.xz
closed #176 thanks for bug report
-rw-r--r--module/PluginThread.py7
-rw-r--r--module/plugins/Crypter.py1
2 files changed, 8 insertions, 0 deletions
diff --git a/module/PluginThread.py b/module/PluginThread.py
index d4a0ed667..20cb10a5b 100644
--- a/module/PluginThread.py
+++ b/module/PluginThread.py
@@ -331,6 +331,13 @@ class DecrypterThread(PluginThread):
self.active.error = msg
return
+
+ except Abort:
+
+ self.m.log.info(_("Download aborted: %s") % pyfile.name)
+ pyfile.setStatus("aborted")
+
+ return
except Retry:
diff --git a/module/plugins/Crypter.py b/module/plugins/Crypter.py
index d326f41e1..ef8d0cfd0 100644
--- a/module/plugins/Crypter.py
+++ b/module/plugins/Crypter.py
@@ -40,6 +40,7 @@ class Crypter(Plugin):
#----------------------------------------------------------------------
def preprocessing(self, thread):
"""prepare"""
+ self.setup()
self.thread = thread
self.decrypt(self.pyfile)