fix fix

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index d392130..8580186 100644 (file)
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -158,7 +158,7 @@ class ChannelSelection(Screen):
 
                self["actions"] = ChannelActionMap(["ChannelSelectActions", "OkCancelActions", "ContextMenuActions"],
                        {
-                               "cancel": self.doClose,
+                               "cancel": self.cancel,
                                "ok": self.channelSelected,
                                "mark": self.doMark,
                                "contextMenu": self.doContext,
@@ -375,7 +375,7 @@ class ChannelSelection(Screen):
                config.tv.lastservice.value = refstr
                config.tv.lastservice.save()
                
-       def doClose(self):
+       def cancel(self):
                self.close()
 
 class SimpleChannelSelection(ChannelSelection):
@@ -395,6 +395,6 @@ class SimpleChannelSelection(ChannelSelection):
        def doContext(self): # don't show context menu
                pass
        
-       def doClose(self):
+       def cancel(self):
                self.close(None)
                
\ No newline at end of file

diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index 8b4f6b4..a03435e 100644 (file)
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@ -178,10 +178,9 @@ class TimerEntry(Screen):
                        self.session.openWithCallback(self.finishedChannelSelection, ChannelSelection.SimpleChannelSelection, _("Select channel to record from"))
 
        def finishedChannelSelection(self, args):
-               if (args != None):
-                       self.timer.service_ref = ServiceReference(args)
-                       config.timerentry.service.vals = (str(self.timer.service_ref.getServiceName()),)
-                       self["config"].invalidate(config.timerentry.service)
+               self.timer.service_ref = ServiceReference(args)
+               config.timerentry.service.vals = (str(self.timer.service_ref.getServiceName()),)
+               self["config"].invalidate(config.timerentry.service)
 
        def keyNumberGlobal(self, number):
                print "You pressed number " + str(number)