X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FSubtitles.py;h=8cabac48a16d8c7f1fcda9f6b31cf3da162234ff;hb=e9f6e4e8facac1243a8bbc93c704e4f2d1a28cc7;hp=54bc7a5bea2aef63fa227c77914ddb05eac270a4;hpb=e68a1617b7c1efbedf8b28309943dd7669daaad0;p=vuplus_dvbapp

diff --git a/lib/python/Screens/Subtitles.py b/lib/python/Screens/Subtitles.py
old mode 100644
new mode 100755
index 54bc7a5..8cabac4
--- a/lib/python/Screens/Subtitles.py
+++ b/lib/python/Screens/Subtitles.py
@@ -7,8 +7,11 @@ from enigma import iPlayableService
 
 from Tools.ISO639 import LanguageCodes
 
+#	ikseong for subtitle hotkey
+from Screens.InfoBar import InfoBar
+
 class Subtitles(Screen, ConfigListScreen):
-	def __init__(self, session):
+	def __init__(self, session, infobar=None):
 		Screen.__init__(self, session)
         
 		self["actions"] = ActionMap(["SetupActions"],
@@ -19,7 +22,13 @@ class Subtitles(Screen, ConfigListScreen):
 
 		self.list = []
 		ConfigListScreen.__init__(self, self.list)
-		self.infobar = self.session.infobar
+#	ikseong for subtitle hotkey
+		if self.session.infobar is None:	
+			if InfoBar.instance:
+				self.infobar = InfoBar.instance
+		else:
+			self.infobar = self.session.infobar
+#
 		self.fillList()
 
 		self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
@@ -84,10 +93,8 @@ class Subtitles(Screen, ConfigListScreen):
 		if self.infobar.selected_subtitle != subtitles:
 			self.infobar.subtitles_enabled = False
 			self.infobar.selected_subtitle = subtitles
-			self.infobar.subtitles_enabled = True
-
-	def disableSubtitles(self):
-		self.infobar.subtitles_enabled = False
+			if subtitles:
+				self.infobar.subtitles_enabled = True
 
 	def keyLeft(self):
 		ConfigListScreen.keyLeft(self)