Merge branch 'bug_713_fix_timerlist_sort'

diff --combined lib/python/Screens/TimerEdit.py
index 572f14b,e9a73ac..8f742b8
--- 1/lib/python/Screens/TimerEdit.py
--- 2/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@@ -13,6 -13,7 +13,7 @@@ from ServiceReference import ServiceRef
  from TimerEntry import TimerEntry, TimerLog
  from Tools.BoundFunction import boundFunction
  from time import time
+ from timer import TimerEntry as RealTimerEntry
  
  class TimerEditList(Screen):
        EMPTY = 0
@@@ -88,9 -89,7 +89,9 @@@
                                if not timersanitycheck.check():
                                        t.disable()
                                        print "Sanity check failed"
 -                                      self.session.openWithCallback(self.finishedEdit, TimerSanityConflict, timersanitycheck.getSimulTimerList())
 +                                      simulTimerList = timersanitycheck.getSimulTimerList()
 +                                      if simulTimerList is not None:
 +                                              self.session.openWithCallback(self.finishedEdit, TimerSanityConflict, simulTimerList)
                                else:
                                        print "Sanity check passed"
                                        if timersanitycheck.doubleCheck():
@@@ -174,11 -173,20 +175,20 @@@
                        self.key_blue_choice = self.EMPTY
  
        def fillTimerList(self):
+               #helper function to move finished timers to end of list
+               def eol_compare(x, y):
+                       if x[0].state != y[0].state and x[0].state == RealTimerEntry.StateEnded or y[0].state == RealTimerEntry.StateEnded:
+                               return cmp(x[0].state, y[0].state)
+                       return cmp(x[0].begin, x[1].begin)
+ 
                list = self.list
                del list[:]
                list.extend([(timer, False) for timer in self.session.nav.RecordTimer.timer_list])
                list.extend([(timer, True) for timer in self.session.nav.RecordTimer.processed_timers])
-               list.sort(key = lambda x: x[0].begin)
+               if config.usage.timerlist_finished_timer_position.index: #end of list
+                       list.sort(cmp = eol_compare)
+               else:
+                       list.sort(key = lambda x: x[0].begin)
  
        def showLog(self):
                cur=self["timerlist"].getCurrent()