Merge branch 'bug_352_fix_some_cutlist_bugs'
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 23 Dec 2009 15:21:59 +0000 (16:21 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 23 Dec 2009 15:21:59 +0000 (16:21 +0100)
1  2 
lib/dvb/dvb.cpp
lib/python/Plugins/Extensions/CutListEditor/plugin.py
lib/service/servicedvb.cpp

diff --cc lib/dvb/dvb.cpp
Simple merge
index efe9f761e3d9e2a769e359161499f2d78608fcaa,ee75ec0957610159cd0bfa1ed50dd542df2fcdf5..abd606d6fa2d9e1bd15580507f485e7f29b3cfee
@@@ -195,11 -189,8 +195,11 @@@ class CutListEditor(Screen, InfoBarBase
                self.onClose.append(self.__onClose)
  
        def __onClose(self):
-               self.session.nav.playService(self.old_service)
+               self.session.nav.playService(self.old_service, forceRestart=True)
  
 +      def updateStateLabel(self, state):
 +              self["SeekState"].setText(state[3].strip())
 +
        def showTutorial(self):
                if not self.tutorial_seen:
                        self.tutorial_seen = True
Simple merge