diff options
| author | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2010-09-27 15:08:16 +0200 |
|---|---|---|
| committer | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2010-10-06 11:05:31 +0200 |
| commit | 8646cfe67f006cbec63cfe8fbbff50b6aa5ba811 (patch) | |
| tree | a479c19be44bcff83c541337cbfc0ab7c45e0aff /lib | |
| parent | 073cea58c7f58a9cd2fe2adf9c93c0557b54d854 (diff) | |
| download | enigma2-8646cfe67f006cbec63cfe8fbbff50b6aa5ba811.tar.gz enigma2-8646cfe67f006cbec63cfe8fbbff50b6aa5ba811.zip | |
fixes bug #584
- Fixes BSOD in radio mode when trying to add a service to the favourites
- Don't close ChannelSelection when adding a service to the facourites.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/python/Screens/ChannelSelection.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py index 0895c9c2..9ced5840 100644 --- a/lib/python/Screens/ChannelSelection.py +++ b/lib/python/Screens/ChannelSelection.py @@ -223,7 +223,7 @@ class ChannelContextMenu(Screen): if cnt > 1: # show bouquet list self.bsel = self.session.openWithCallback(self.bouquetSelClosed, BouquetSelector, bouquets, self.addCurrentServiceToBouquet) elif cnt == 1: # add to only one existing bouquet - self.addCurrentServiceToBouquet(bouquets[0][1]) + self.addCurrentServiceToBouquet(bouquets[0][1], closeBouquetSelection = False) def bouquetSelClosed(self, recursive): self.bsel = None @@ -257,12 +257,12 @@ class ChannelContextMenu(Screen): self.csel.addMarker(marker) self.close() - def addCurrentServiceToBouquet(self, dest): + def addCurrentServiceToBouquet(self, dest, closeBouquetSelection = True): self.csel.addServiceToBouquet(dest) if self.bsel is not None: self.bsel.close(True) else: - self.close(True) # close bouquet selection + self.close(closeBouquetSelection) # close bouquet selection def removeCurrentService(self): self.csel.removeCurrentService() @@ -1400,9 +1400,9 @@ class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit, ChannelS self["actions"] = ActionMap(["OkCancelActions", "TvRadioActions"], { - "keyTV": self.closeRadio, - "keyRadio": self.closeRadio, - "cancel": self.closeRadio, + "keyTV": self.cancel, + "keyRadio": self.cancel, + "cancel": self.cancel, "ok": self.channelSelected, }) @@ -1440,7 +1440,7 @@ class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit, ChannelS self["RdsActions"].setEnabled(state) ########## RDS Radiotext / Rass Support END - def closeRadio(self): + def cancel(self): self.infobar.rds_display.onRassInteractivePossibilityChanged.remove(self.RassInteractivePossibilityChanged) self.info.hide() #set previous tv service |