git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
f24b1a7
)
Merge branch 'master' of git://git.opendreambox.org/git/acidburn/enigma2-master
author
Felix Domke
<tmbinc@elitedvb.net>
Tue, 6 Jan 2009 12:55:53 +0000
(13:55 +0100)
committer
Felix Domke
<tmbinc@elitedvb.net>
Tue, 6 Jan 2009 12:55:53 +0000
(13:55 +0100)
lib/python/Components/Task.py
patch
|
blob
|
history
diff --git
a/lib/python/Components/Task.py
b/lib/python/Components/Task.py
index 04e5c9385948e0e4426619787ada2fa3199b8bb4..df94f8a6b9e1c880b7fea54236fe73ea2e2705be 100644
(file)
--- a/
lib/python/Components/Task.py
+++ b/
lib/python/Components/Task.py
@@
-131,6
+131,7
@@
class Task(object):
self.task_progress_changed = None
self.output_line = ""
job.addTask(self)
+ self.container = None
def setCommandline(self, cmd, args):
self.cmd = cmd
@@
-211,7
+212,8
@@
class Task(object):
self.finish()
def abort(self):
- self.container.kill()
+ if self.container:
+ self.container.kill()
self.finish(aborted = True)
def finish(self, aborted = False):