From: ghost <andreas.monzner@multimedia-labs.de>
Date: Thu, 11 Jun 2009 21:57:55 +0000 (+0200)
Subject: InfoBarGenerics.py: some subtitle screen show/hide fixes
X-Git-Tag: 2.6.0~247^2~3
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/0efa85535ab64a0697fe415d3750341c516268b8?hp=ba61ec0812bb241b10f1201db675f22d1fdf99e9

InfoBarGenerics.py: some subtitle screen show/hide fixes
---

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 9adaa6db..7f90b976 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -2181,19 +2181,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 +2201,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()