X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d731c3f593fc10252efee0ea0940f6a94f32a056..10bcb34f8993ecc000f027ecc8ce7fc89f0bda2b:/lib/python/Screens/EpgSelection.py

diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py
index 64be16b7..d6fee567 100644
--- a/lib/python/Screens/EpgSelection.py
+++ b/lib/python/Screens/EpgSelection.py
@@ -9,6 +9,7 @@ from RecordTimer import RecordTimerEntry, parseEvent
 from TimerEdit import TimerEditList
 from TimerEntry import TimerEntry
 from ServiceReference import ServiceReference
+from Components.config import config, currentConfigSelectionElement
 
 import xml.dom.minidom
 
@@ -38,22 +39,26 @@ class EPGSelection(Screen):
 
 		self["actions"] = ChannelActionMap(["EPGSelectActions", "OkCancelActions"],
 			{
-				"cancel": self.closeClose,
+				"cancel": self.closeScreen,
 				"ok": self.eventSelected,
 				"timerAdd": self.timerAdd,
 				"yellow": self.yellowButtonPressed,
 				"blue": self.blueButtonPressed,
-				"info": self.closeClose
+				"info": self.infoKeyPressed
 			})
 		self["actions"].csel = self
 
 		self.onLayoutFinish.append(self.onCreate)
 
-	def closeClose(self):
+	def infoKeyPressed(self):
+		if currentConfigSelectionElement(config.usage.epgtoggle) == "yes":
+			self.close(True)
+		else:
+			self.close(False)
+
+	def closeScreen(self):
 		self.close(False)
-		
-	def closeInfo(self):
-		self.close(True)
+
 
 	#just used in multipeg
 	def onCreate(self):
@@ -116,7 +121,7 @@ class EPGSelection(Screen):
 		self.session.openWithCallback(self.timerEditFinished, TimerEntry, newEntry)
 
 	def timerEditFinished(self, answer):
-		if (answer[0]):
+		if answer[0]:
 			self.session.nav.RecordTimer.record(answer[1])
 		else:
 			print "Timeredit aborted"