fix enq answer handling of numbers with beginning zero's

[enigma2.git] / lib / python / Screens / EpgSelection.py

diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py
index 9458e39564a209ccd1d0a61edd01083f1a33ecc8..d6fee56759e5b50b32642a5ce888c9a3ae0bc261 100644 (file)
--- 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.closeInfo
+                               "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"