From 3910a582c058f0257907205d362378c972f68132 Mon Sep 17 00:00:00 2001 From: Dmitriy Marmyshev Date: Wed, 18 Sep 2013 08:50:07 +0400 Subject: [PATCH] fixed replacing background with video unblank screen even if it blanked to theme. Fixes: https://launchpad.net/bugs/1225763 --- .bzrignore | 1 + openlp/core/ui/media/mediacontroller.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.bzrignore b/.bzrignore index d87c55a61..73776cc57 100644 --- a/.bzrignore +++ b/.bzrignore @@ -2,6 +2,7 @@ *.*~ \#*\# *.eric4project +*.eric5project *.ropeproject *.e4* .eric4project diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index b1fa43ea9..bfd3c073b 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -527,7 +527,8 @@ class MediaController(object): else: self.media_volume(controller, controller.media_info.volume) if status: - display.frame.evaluateJavaScript('show_blank("desktop");') + if not controller.media_info.is_background: + display.frame.evaluateJavaScript('show_blank("desktop");') self.current_media_players[controller.controller_type].set_visible(display, True) # Flash needs to be played and will not AutoPlay if controller.media_info.is_flash: @@ -538,7 +539,7 @@ class MediaController(object): controller.mediabar.actions['playbackPause'].setVisible(True) controller.mediabar.actions['playbackStop'].setVisible(True) if controller.is_live: - if controller.hide_menu.defaultAction().isChecked(): + if controller.hide_menu.defaultAction().isChecked() and not controller.media_info.is_background: controller.hide_menu.defaultAction().trigger() # Start Timer for ui updates if not self.timer.isActive():