From aea6c424fc162e97572d6172f9c8d98492b12bc0 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Mon, 15 Jun 2015 21:29:34 +0100 Subject: [PATCH] Check mediaplayer is loaded before trying to use it when blanking. Fixes bug 1465390. Fixes: https://launchpad.net/bugs/1465390 --- openlp/core/ui/media/mediacontroller.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index 39e7d3b65..5209a8253 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -721,8 +721,8 @@ class MediaController(RegistryMixin, OpenLPMixin, RegistryProperties): display = self._define_display(self.live_controller) if self.live_controller.controller_type in self.current_media_players and \ self.current_media_players[self.live_controller.controller_type].state == MediaState.Playing: - self.current_media_players[self.live_controller.controller_type].pause(display) - self.current_media_players[self.live_controller.controller_type].set_visible(display, False) + self.current_media_players[self.live_controller.controller_type].pause(display) + self.current_media_players[self.live_controller.controller_type].set_visible(display, False) def media_blank(self, msg): """ @@ -737,7 +737,8 @@ class MediaController(RegistryMixin, OpenLPMixin, RegistryProperties): return Registry().execute('live_display_hide', hide_mode) display = self._define_display(self.live_controller) - if self.current_media_players[self.live_controller.controller_type].state == MediaState.Playing: + if self.live_controller.controller_type in self.current_media_players and \ + self.current_media_players[self.live_controller.controller_type].state == MediaState.Playing: self.current_media_players[self.live_controller.controller_type].pause(display) self.current_media_players[self.live_controller.controller_type].set_visible(display, False)