dont ask for scanning second nim in automatic scan, when it is not meaningful

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

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index c424417f1232e0c85e791d124c0ba1ab054186d7..018e28dc09d6815acc7bc4408e38b9098714e236 100644 (file)
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -84,6 +84,7 @@ class TimerEditList(Screen):
                
                for timer in self.session.nav.RecordTimer.processed_timers:
                        self.list.append(TimerEntryComponent(timer, processed=True))
+               self.list.sort(cmp = lambda x, y: x[0].begin < y[0].begin)
 
        def showLog(self):
                self.session.openWithCallback(self.finishedEdit, TimerLog, self["timerlist"].getCurrent()[0])
@@ -103,13 +104,8 @@ class TimerEditList(Screen):
        def removeTimer(self):
                list = self["timerlist"]
                timer = list.getCurrent()[0]
-               currentIndex = list.getCurrentIndex()
                self.session.nav.RecordTimer.removeEntry(timer)
-               list.moveDown()
-               if list.getCurrentIndex() == currentIndex:
-                       currentIndex -= 1
                self.refill()
-               list.moveToIndex(currentIndex)
        
        def refill(self):
                self.fillTimerList()
@@ -181,7 +177,7 @@ class TimerSanityConflict(Screen):
        def __init__(self, session, timer):
                Screen.__init__(self, session)
                self.timer = timer
-               print timer
+               print "TimerSanityConflict", timer
                        
                self["timer1"] = TimerList(self.getTimerList(timer[0]))
                if len(timer) > 1: