From 2e23d9919dd09751b848af8956b74060f8003c07 Mon Sep 17 00:00:00 2001 From: Jonathan Springer Date: Mon, 7 Dec 2015 16:40:09 -0500 Subject: [PATCH] Fix system player being used for live-background --- openlp/core/ui/media/mediacontroller.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index b5ed791d3..9241f0517 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -531,12 +531,16 @@ class MediaController(RegistryMixin, OpenLPMixin, RegistryProperties): if not title: continue player = self.media_players[title] + # The system player may not return what files it can play so add it now + # and check whether it can play the file later if title == 'system': - self.resize(display, player) - if player.load(display): - self.current_media_players[controller.controller_type] = player - controller.media_info.media_type = MediaType.Video - return True + if not controller.media_info.is_background or controller.media_info.is_background and \ + player.can_background: + self.resize(display, player) + if player.load(display): + self.current_media_players[controller.controller_type] = player + controller.media_info.media_type = MediaType.Video + return True if suffix in player.video_extensions_list: if not controller.media_info.is_background or controller.media_info.is_background and \ player.can_background: