Merge remote-tracking branch 'origin/acid-burn/virtualkeyboard'

[enigma2.git] / lib / python / Screens / TaskView.py

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()