fix selection when delete latest timer in list

diff --git a/lib/python/Components/TimerList.py b/lib/python/Components/TimerList.py
index d79187d185723bd4166ec84369ef1ca3281c6eb7..8bb6a0d9c263b408c3a54932e32b5acee6d7f769 100644 (file)
--- a/lib/python/Components/TimerList.py
+++ b/lib/python/Components/TimerList.py
@@ -76,7 +76,16 @@ class TimerList(HTMLComponent, GUIComponent):
                self.instance = eListbox(parent)
                self.instance.setContent(self.l)
                self.instance.setItemHeight(70)
-       
+
+       def moveToIndex(self, index):
+               self.instance.moveSelectionTo(index)
+
+       def getCurrentIndex(self):
+               return self.instance.getCurrentIndex()
+
+       def moveDown(self):
+               self.instance.moveSelection(self.instance.moveDown)
+
        def GUIdelete(self):
                self.instance.setContent(None)
                self.instance = None

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index 560ec942f509043ada58c40f44550073f6426583..c0896f4107ff1953fddaba589e37dfed672dd0f7 100644 (file)
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -48,8 +48,13 @@ class TimerEditList(Screen):
                #self.session.open(TimerEdit, self["timerlist"].getCurrent()[0])
                
        def removeTimer(self):
-               # FIXME doesn't work...
-               self.session.nav.RecordTimer.removeEntry(self["timerlist"].getCurrent()[0])
+               list = self["timerlist"]
+               currentIndex = list.getCurrentIndex()
+               list.moveDown()
+               if list.getCurrentIndex() == currentIndex:
+                       currentIndex -= 1
+                       list.moveToIndex(currentIndex)
+               self.session.nav.RecordTimer.removeEntry(list.getCurrent()[0])
                self.refill()
        
        def refill(self):