git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ee9a89e
94b346a
)
Merge branch 'bug_352_fix_some_cutlist_bugs'
author
ghost
<andreas.monzner@multimedia-labs.de>
Wed, 23 Dec 2009 15:21:59 +0000
(16:21 +0100)
committer
ghost
<andreas.monzner@multimedia-labs.de>
Wed, 23 Dec 2009 15:21:59 +0000
(16:21 +0100)
1
2
lib/dvb/dvb.cpp
patch
|
diff1
|
diff2
|
blob
|
history
lib/python/Plugins/Extensions/CutListEditor/plugin.py
patch
|
diff1
|
diff2
|
blob
|
history
lib/service/servicedvb.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/dvb/dvb.cpp
Simple merge
diff --cc
lib/python/Plugins/Extensions/CutListEditor/plugin.py
index efe9f761e3d9e2a769e359161499f2d78608fcaa,ee75ec0957610159cd0bfa1ed50dd542df2fcdf5..abd606d6fa2d9e1bd15580507f485e7f29b3cfee
---
1
/
lib/python/Plugins/Extensions/CutListEditor/plugin.py
---
2
/
lib/python/Plugins/Extensions/CutListEditor/plugin.py
+++ b/
lib/python/Plugins/Extensions/CutListEditor/plugin.py
@@@
-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
diff --cc
lib/service/servicedvb.cpp
Simple merge