X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FInfoBarGenerics.py;h=8224d20d936cc59396594037befe91b12132e153;hp=a85bcc97d0015b1e621ae0889651ae729a632d63;hb=6ebe2f45ec609f3769a4a57e4bbbf776aa3cb930;hpb=95c570d26ce81e3dd1e0610ff6c5c0b34d75ba5a

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index a85bcc9..8224d20 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -1342,9 +1342,8 @@ class InfoBarAudioSelection:
 				language = i.getLanguage()
 				description = i.getDescription()
 	
-				if len(language) == 3:
-					if language in LanguageCodes:
-						language = LanguageCodes[language][0]
+				if LanguageCodes.has_key(language):
+					language = LanguageCodes[language][0]
 	
 				if len(description):
 					description += " (" + language + ")"
@@ -1749,14 +1748,15 @@ class InfoBarSubtitleSupport(object):
 
 		self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
 			{
-				iPlayableService.evStart: self.__serviceStarted,
+				iPlayableService.evEnd: self.__serviceStopped,
 				iPlayableService.evUpdatedInfo: self.__updatedInfo
 			})
-
-	def __serviceStarted(self):
 		self.cached_subtitle_checked = False
+
+	def __serviceStopped(self):
 		self.subtitle_window.hide()
 		self.__subtitles_enabled = False
+		self.cached_subtitle_checked = False
 
 	def __updatedInfo(self):
 		if not self.cached_subtitle_checked: