Merge branch 'master' into bug_245_record_playback_fixes

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

diff --git a/lib/python/Screens/TaskView.py b/lib/python/Screens/TaskView.py
index 1dcdc5158aac8549f73cc5ee5e7e37caf1b16902..1453c05f338de2a28e142bbde4f7d80afd7738fb 100644 (file)
--- a/lib/python/Screens/TaskView.py
+++ b/lib/python/Screens/TaskView.py
@@ -33,7 +33,7 @@ class JobView(InfoBarNotifications, Screen, ConfigListScreen):
                self.onShow.append(self.windowShow)
                self.onHide.append(self.windowHide)
 
-               self["setupActions"] = ActionMap(["SetupActions", "ColorActions"],
+               self["setupActions"] = ActionMap(["ColorActions", "SetupActions"],
                {
                    "green": self.ok,
                    "red": self.abort,
@@ -80,7 +80,7 @@ class JobView(InfoBarNotifications, Screen, ConfigListScreen):
                else:
                        self["job_task"].text = ""
                        self["summary_job_task"].text = j.getStatustext()
-               if j.status in [j.FINISHED, j.FAILED]:
+               if j.status in (j.FINISHED, j.FAILED):
                        self.performAfterEvent()
                        self["backgroundable"].boolean = False
                        if j.status == j.FINISHED:
@@ -94,11 +94,11 @@ class JobView(InfoBarNotifications, Screen, ConfigListScreen):
                        self.close(True)
 
        def ok(self):
-               if self.job.status in [self.job.FINISHED, self.job.FAILED]:
+               if self.job.status in (self.job.FINISHED, self.job.FAILED):
                        self.close(False)
 
        def abort(self):
-               if self.job.status in [self.job.FINISHED, self.job.FAILED]:
+               if self.job.status in (self.job.FINISHED, self.job.FAILED):
                        self.close(False)
                if self["cancelable"].boolean == True:
                        self.job.cancel()