raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Headr650

Browse Source
This commit is contained in:
Tim Bentley 2009-11-02 18:08:16 +00:00
commit 2d473d9436
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openlp/core/ui/maindisplay.py
View File

@ -283,11 +283,8 @@ class MainDisplay(DisplayLabel):
self.display.show() self.display.show()
def onMediaFinish(self): def onMediaFinish(self):
<<<<<<< TREE
log.debug(u'Finish playing media') log.debug(u'Finish playing media')
self.setVisible(False) self.setVisible(False)
=======
>>>>>>> MERGE-SOURCE
self.mediaObject.stop() self.mediaObject.stop()
self.mediaObject.clearQueue() self.mediaObject.clearQueue()
self.mediaLoaded = False self.mediaLoaded = False

2
version.txt
View File

@ -1 +1 @@
1.9.0-646 1.9.0-650