diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2011-09-06 15:19:29 +0200 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2011-09-06 15:19:29 +0200 |
| commit | 80c9ad7d8d0e709d8bed740481b46ff23654fcaa (patch) | |
| tree | 1e484a4613b7266a73eafdd99f13793e6e30d60d | |
| parent | 4712fa7b44263f0e9517bb5a4b1729d922994572 (diff) | |
| parent | 2d3dfd7793532da77fc3f2cdb2b5bc282703dc15 (diff) | |
| download | enigma2-80c9ad7d8d0e709d8bed740481b46ff23654fcaa.tar.gz enigma2-80c9ad7d8d0e709d8bed740481b46ff23654fcaa.zip | |
Merge remote-tracking branch 'origin/bug_747_cancel_waiting_tasks'
| -rw-r--r-- | lib/python/Screens/TaskView.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/python/Screens/TaskView.py b/lib/python/Screens/TaskView.py index 660fb276..6e1b752d 100644 --- 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() |