diff options
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/Screens/ChannelSelection.py | 5 | ||||
| -rw-r--r-- | lib/python/Screens/InfoBarGenerics.py | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py index 47a9d9e6..bbd4fd3f 100644 --- a/lib/python/Screens/ChannelSelection.py +++ b/lib/python/Screens/ChannelSelection.py @@ -897,9 +897,12 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect self.session.nav.playService(nref) self.saveRoot() self.saveChannel() + self.addToHistory(nref) + + def addToHistory(self, ref): if self.servicePath is not None: tmp=self.servicePath[:] - tmp.append(nref) + tmp.append(ref) try: del self.history[self.history_pos+1:] except: diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py index a11e9262..d08a050b 100644 --- a/lib/python/Screens/InfoBarGenerics.py +++ b/lib/python/Screens/InfoBarGenerics.py @@ -1241,14 +1241,13 @@ class InfoBarSubserviceSelection: }, -1) self["SubserviceQuickzapAction"].setEnabled(False) - self.session.nav.event.append(self.checkParentAvail) # we like to get service events + self.session.nav.event.append(self.checkSubservicesAvail) # we like to get service events - def checkParentAvail(self, ev): - ref=self.session.nav.getCurrentlyPlayingServiceReference() + def checkSubservicesAvail(self, ev): if ev == iPlayableService.evUpdatedEventInfo: - if ref.getData(5): - self["SubserviceQuickzapAction"].setEnabled(True) - else: + service = self.session.nav.getCurrentService() + subservices = service.subServices() + if subservices.getNumberOfSubservices() == 0: self["SubserviceQuickzapAction"].setEnabled(False) def nextSubservice(self): @@ -1298,6 +1297,7 @@ class InfoBarSubserviceSelection: def subserviceSelected(self, service): if not service is None: + self["SubserviceQuickzapAction"].setEnabled(True) self.session.nav.playService(service[1]) class InfoBarAdditionalInfo: |