git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
4712fa7
)
Merge remote-tracking branch 'origin/bug_747_cancel_waiting_tasks'
author
ghost
<andreas.monzner@multimedia-labs.de>
Tue, 6 Sep 2011 13:19:29 +0000
(15:19 +0200)
committer
ghost
<andreas.monzner@multimedia-labs.de>
Tue, 6 Sep 2011 13:19:29 +0000
(15:19 +0200)
lib/python/Screens/TaskView.py
patch
|
blob
|
history
diff --git
a/lib/python/Screens/TaskView.py
b/lib/python/Screens/TaskView.py
index 660fb2769a16b610e005c73b4916af537d534d2a..6e1b752dc57a2b9a6aabac18c524fce764d6c144 100644
(file)
--- a/
lib/python/Screens/TaskView.py
+++ b/
lib/python/Screens/TaskView.py
@@
-108,10
+108,10
@@
class JobView(InfoBarNotifications, Screen, ConfigListScreen):
self.close(False)
def abort(self):
- if self.job.status in (self.job.FINISHED, self.job.FAILED):
- self.close(False)
- if self["cancelable"].boolean == True:
+ if self.job.status == self.job.IN_PROGRESS and self["cancelable"].boolean == True:
self.job.cancel()
+ else:
+ self.close(False)
def performAfterEvent(self):
self["config"].hide()