add runAsync support to wizzard

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

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index d343f83327ba6ef3fcc65437d48f8700f7241d86..99f0dc48399ee6238cd32854efa398a5e90f3936 100644 (file)
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -568,9 +568,9 @@ class InfoBarRdsDecoder:
                                iPlayableService.evUpdatedRassSlidePic: self.RassSlidePicChanged
                        })
                
-               self["RdsActions"] = HelpableActionMap(self, "InfobarRdsActions",
+               self["RdsActions"] = ActionMap(["InfobarRdsActions"],
                {
-                       "startRassInteractive": (self.startRassInteractive, _("View Rass interactive..."))
+                       "startRassInteractive": self.startRassInteractive
                },-1)
 
                self["RdsActions"].setEnabled(False)
@@ -652,6 +652,7 @@ class InfoBarSeek:
                                if action[:5] == "seek:":
                                        time = int(action[5:])
                                        self.screen.seekRelative(time * 90000)
+                                       self.screen.doShow()
                                        return 1
                                else:
                                        return HelpableActionMap.action(self, contexts, action)
@@ -989,7 +990,7 @@ class InfoBarShowMovies:
 # Timeshift works the following way:
 #                                         demux0   demux1                    "TimeshiftActions" "TimeshiftActivateActions" "SeekActions"
 # - normal playback                       TUNER    unused      PLAY               enable                disable              disable
-# - user presses "yellow" button.         TUNER    record      PAUSE              enable                disable              enable
+# - user presses "yellow" button.         FILE     record      PAUSE              enable                disable              enable
 # - user presess pause again              FILE     record      PLAY               enable                disable              enable
 # - user fast forwards                    FILE     record      FF                 enable                disable              enable
 # - end of timeshift buffer reached       TUNER    record      PLAY               enable                enable               disable
@@ -1056,7 +1057,8 @@ class InfoBarTimeshift:
                                #self.pvrStateDialog["timeshift"].setRelative(time.time())
 
                                # PAUSE.
-                               self.setSeekState(self.SEEK_STATE_PAUSE)
+                               #self.setSeekState(self.SEEK_STATE_PAUSE)
+                               self.activateTimeshiftEnd(False)
 
                                # enable the "TimeshiftEnableActions", which will override
                                # the startTimeshift actions
@@ -1917,6 +1919,7 @@ class InfoBarSubtitleSupport(object):
                                iPlayableService.evUpdatedInfo: self.__updatedInfo
                        })
                self.cached_subtitle_checked = False
+               self.__selected_subtitle = None
 
        def __serviceStopped(self):
                self.subtitle_window.hide()
@@ -1927,8 +1930,7 @@ class InfoBarSubtitleSupport(object):
                if not self.cached_subtitle_checked:
                        subtitle = self.getCurrentServiceSubtitle()
                        self.cached_subtitle_checked = True
-                       if subtitle:
-                               self.__selected_subtitle = subtitle.getCachedSubtitle()
+                       self.__selected_subtitle = subtitle and subtitle.getCachedSubtitle()
                        if self.__selected_subtitle:
                                subtitle.enableSubtitles(self.subtitle_window.instance, self.selected_subtitle)
                                self.subtitle_window.show()