X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ca7d92c97764d916bb8dd6731efa1ccff693b944..88d7390f3d29293d4f87b9f70833215378305255:/lib/python/Screens/ChannelSelection.py diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py index 47a9d9e6..d4a52799 100644 --- a/lib/python/Screens/ChannelSelection.py +++ b/lib/python/Screens/ChannelSelection.py @@ -128,7 +128,7 @@ class ChannelContextMenu(Screen): def bouquetInputCallback(self, bouquet): if bouquet is not None: - self.csel.addBouquet(bouquet, True) + self.csel.addBouquet(bouquet, None, True) def addServiceToBouquetSelected(self): bouquets = self.csel.getBouquetList() @@ -441,7 +441,7 @@ class ChannelSelectionBase(Screen): Screen.__init__(self, session) # this makes it much simple to implement a selectable radio or tv mode :) - self.service_types_tv = '1:7:1:0:0:0:0:0:0:0:(type == 1) || (type == 17) || (type == 195)' + self.service_types_tv = '1:7:1:0:0:0:0:0:0:0:(type == 1) || (type == 17) || (type == 195) || (type == 25)' self.service_types_radio = '1:7:2:0:0:0:0:0:0:0:(type == 2)' self["key_red"] = Button(_("All")) @@ -895,11 +895,14 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect nref = self.getCurrentSelection() if ref is None or ref != nref: self.session.nav.playService(nref) - self.saveRoot() - self.saveChannel() + 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: