fix picon-bug in RadioInfoBar

philotas · Aug 21, 2015 · 55f1f71 · 55f1f71
1 parent 1eacb02
commit 55f1f71
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/lib/python/Components/PerServiceDisplay.py b/lib/python/Components/PerServiceDisplay.py
@@ -44,8 +44,12 @@ def __init__(self, navcore, eventmap, with_event=False):
 
 	def destroy(self):
 		EventMap = PerServiceBase.EventMap.setdefault
-		for x in self.eventmap.iteritems():
-			EventMap(x[0], []).remove((self.with_event, x[1]))
+#TODO investigate what happens with self.eventmap if it disappears
+		try:
+			for x in self.eventmap.iteritems():
+				EventMap(x[0], []).remove((self.with_event, x[1]))
+		except:
+			pass
 
 	def enablePolling(self, interval=60000):
 		if interval:

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
@@ -2686,7 +2686,7 @@ def __onExecBegin(self):
 		self.info.show()
 
 	def __onExecEnd(self):
-		self.info.hide()
+		self.session.deleteDialog(self.info)
 
 	def cancel(self):
 		self.infobar.rds_display.onRassInteractivePossibilityChanged.remove(self.RassInteractivePossibilityChanged)

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
@@ -225,6 +225,8 @@ def toogleTvRadio(self):
 
 	def ChannelSelectionRadioClosed(self, *arg):
 		self.rds_display.show()  # in InfoBarRdsDecoder
+		self.radioTV = 0
+		self.doShow()
 
 	def showMovies(self, defaultRef=None):
 		if getMachineBrand() == 'GI' or boxtype.startswith('azbox') or boxtype.startswith('ini') or boxtype.startswith('venton'):