X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6b924837dedad17ea56ca37075e760828469abcb..3a044bea307a02147e2d01ad29f07b7348bd7203:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 9adaa6db..bfeb394b 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -366,8 +366,16 @@ class InfoBarSimpleEventView:
 		self["EPGActions"] = HelpableActionMap(self, "InfobarEPGActions",
 			{
 				"showEventInfo": (self.openEventView, _("show event details")),
+				"showInfobarOrEpgWhenInfobarAlreadyVisible": self.showEventInfoWhenNotVisible,
 			})
 
+	def showEventInfoWhenNotVisible(self):
+		if self.shown:
+			self.openEventView()
+		else:
+			self.toggleShow()
+			return 1
+
 	def openEventView(self):
 		epglist = [ ]
 		self.epglist = epglist
@@ -2181,19 +2189,19 @@ class InfoBarSubtitleSupport(object):
 		self.__selected_subtitle = None
 
 	def __serviceStopped(self):
-		self.subtitle_window.hide()
-		self.__subtitles_enabled = False
 		self.cached_subtitle_checked = False
+		if self.__subtitles_enabled:
+			self.subtitle_window.hide()
+			self.__subtitles_enabled = False
+			self.__selected_subtitle = None
 
 	def __updatedInfo(self):
 		if not self.cached_subtitle_checked:
-			subtitle = self.getCurrentServiceSubtitle()
 			self.cached_subtitle_checked = True
-			self.__selected_subtitle = subtitle and subtitle.getCachedSubtitle()
+			subtitle = self.getCurrentServiceSubtitle()
+			self.setSelectedSubtitle(subtitle and subtitle.getCachedSubtitle())
 			if self.__selected_subtitle:
-				subtitle.enableSubtitles(self.subtitle_window.instance, self.selected_subtitle)
-				self.subtitle_window.show()
-				self.__subtitles_enabled = True
+				self.setSubtitlesEnable(True)
 
 	def getCurrentServiceSubtitle(self):
 		service = self.session.nav.getCurrentService()
@@ -2201,14 +2209,16 @@ class InfoBarSubtitleSupport(object):
 
 	def setSubtitlesEnable(self, enable=True):
 		subtitle = self.getCurrentServiceSubtitle()
-		if enable and self.__selected_subtitle is not None:
-			if subtitle and not self.__subtitles_enabled:
-				subtitle.enableSubtitles(self.subtitle_window.instance, self.selected_subtitle)
-				self.subtitle_window.show()
-				self.__subtitles_enabled = True
+		if enable:
+			if self.__selected_subtitle:
+				if subtitle and not self.__subtitles_enabled:
+					subtitle.enableSubtitles(self.subtitle_window.instance, self.selected_subtitle)
+					self.subtitle_window.show()
+					self.__subtitles_enabled = True
 		else:
 			if subtitle:
 				subtitle.disableSubtitles(self.subtitle_window.instance)
+			self.__selected_subtitle = False
 			self.__subtitles_enabled = False
 			self.subtitle_window.hide()