openlp-core team mailing list archive

[Dmitriy Marmyshev <marmyshev@xxxxxxxxx>]

Dmitriy Marmyshev has proposed merging lp:~marmyshev/openlp/20_bug_1225763 into lp:openlp/2.0.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1225763 in OpenLP: "Replacing background with video unblank screen even if "Blanked to Theme""
  https://bugs.launchpad.net/openlp/+bug/1225763

For more details, see:
https://code.launchpad.net/~marmyshev/openlp/20_bug_1225763/+merge/186430

Fixed: replacing background with video unblank screen even if "Blanked to Theme" and shows content.
-- 
https://code.launchpad.net/~marmyshev/openlp/20_bug_1225763/+merge/186430
Your team OpenLP Core is requested to review the proposed merge of lp:~marmyshev/openlp/20_bug_1225763 into lp:openlp/2.0.

=== modified file '.bzrignore'
--- .bzrignore	2012-03-23 20:52:07 +0000
+++ .bzrignore	2013-09-18 19:40:37 +0000
@@ -2,6 +2,7 @@
 *.*~
 \#*\#
 *.eric4project
+*.eric5project
 *.ropeproject
 *.e4*
 .eric4project

=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py	2012-12-30 19:41:24 +0000
+++ openlp/core/ui/media/mediacontroller.py	2013-09-18 19:40:37 +0000
@@ -423,10 +423,11 @@
                     controller.volumeSlider.blockSignals(False)
                     return False
                 if status:
-                    display.frame.evaluateJavaScript(u'show_blank("desktop");')
+                    if not controller.media_info.is_background:
+                        display.frame.evaluateJavaScript(u'show_blank("desktop");')
                     self.curDisplayMediaPlayer[display].set_visible(display,
                         True)
-                    if controller.isLive:
+                    if controller.isLive and not controller.media_info.is_background:
                         if controller.hideMenu.defaultAction().isChecked():
                             controller.hideMenu.defaultAction().trigger()
         # Start Timer for ui updates