rimach has proposed merging lp:~crichter/openlp/bug-927816 into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~crichter/openlp/bug-927816/+merge/95693
fix for bug #927816
--
https://code.launchpad.net/~crichter/openlp/bug-927816/+merge/95693
Your team OpenLP Core is requested to review the proposed merge of
lp:~crichter/openlp/bug-927816 into lp:openlp.
=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py 2012-01-19 19:13:19 +0000
+++ openlp/core/ui/media/mediacontroller.py 2012-03-02 23:13:23 +0000
@@ -100,8 +100,7 @@
Register each media Player controller (Webkit, Phonon, etc) and store
for later use
"""
- if controller.check_available():
- self.mediaPlayers[controller.name] = controller
+ self.mediaPlayers[controller.name] = controller
def check_available_media_players(self):
"""
@@ -134,7 +133,8 @@
QtCore.QVariant(u'webkit')).toString())
savedPlayers = playerSettings.split(u',')
invalidMediaPlayers = [mediaPlayer for mediaPlayer in savedPlayers \
- if not mediaPlayer in self.mediaPlayers]
+ if not mediaPlayer in self.mediaPlayers or \
+ self.mediaPlayers[mediaPlayer].check_available() == False]
if len(invalidMediaPlayers) > 0:
for invalidPlayer in invalidMediaPlayers:
savedPlayers.remove(invalidPlayer)
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
