[ScanSetup] Fix error on complete scan with T2 tuners.

[vuplus_dvbapp] / lib / python / Screens / InfoBar.py

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 860022a..4145722 100755 (executable)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -11,7 +11,7 @@ from enigma import iPlayableService
 profile("LOAD:InfoBarGenerics")
 from Screens.InfoBarGenerics import InfoBarShowHide, \
        InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarRdsDecoder, \
-       InfoBarEPG, InfoBarSeek, InfoBarInstantRecord, \
+       InfoBarEPG, InfoBarSeek, InfoBarInstantRecord, InfoBarRedButton, \
        InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarUnhandledKey, \
        InfoBarSubserviceSelection, InfoBarShowMovies, InfoBarTimeshift,  \
        InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, \
@@ -28,7 +28,7 @@ from Screens.HelpMenu import HelpableScreen
 
 class InfoBar(InfoBarBase, InfoBarShowHide,
        InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder,
-       InfoBarInstantRecord, InfoBarAudioSelection, 
+       InfoBarInstantRecord, InfoBarAudioSelection, InfoBarRedButton,
        HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarUnhandledKey,
        InfoBarSubserviceSelection, InfoBarTimeshift, InfoBarSeek,
        InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions,
@@ -45,7 +45,6 @@ class InfoBar(InfoBarBase, InfoBarShowHide,
                                "showMovies": (self.showMovies, _("Play recorded movies...")),
                                "showRadio": (self.showRadio, _("Show the radio player...")),
                                "showTv": (self.showTv, _("Show the tv player...")),
-                               #       ikseong action for subtitle hotkey
                                "showSubtitle":(self.showSubtitle, _("Show the Subtitle...")),
                        }, prio=2)
                
@@ -54,7 +53,7 @@ class InfoBar(InfoBarBase, InfoBarShowHide,
                for x in HelpableScreen, \
                                InfoBarBase, InfoBarShowHide, \
                                InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder, \
-                               InfoBarInstantRecord, InfoBarAudioSelection, InfoBarUnhandledKey, \
+                               InfoBarInstantRecord, InfoBarAudioSelection, InfoBarRedButton, InfoBarUnhandledKey, \
                                InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, \
                                InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, \
                                InfoBarTeletextPlugin, InfoBarExtensions, InfoBarPiP, InfoBarSubtitleSupport, InfoBarJobman, \
@@ -125,7 +124,6 @@ class InfoBar(InfoBarBase, InfoBarShowHide,
                if service is not None:
                        self.session.open(MoviePlayer, service)
 
-       #       ikseong action for subtitle hotkey
        def showSubtitle(self):
                from Screens.Subtitles import Subtitles
                self.session.open(Subtitles)
@@ -145,7 +143,6 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \
                
                self["actions"] = HelpableActionMap(self, "MoviePlayerActions",
                        {
-                               #       ikseong action for subtitle hotkey
                                "showSubtitle":(self.showSubtitle, _("Show the Subtitle...")),
                                "leavePlayer": (self.leavePlayer, _("leave movie player..."))
                        })
@@ -251,8 +248,7 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \
                        self.returning = False
                elif self.returning:
                        self.close()
-                       
-       #       ikseong action for subtitle hotkey
+
        def showSubtitle(self):
                from Screens.Subtitles import Subtitles
                self.session.open(Subtitles)