1
0
mirror of https://gitlab.com/openlp/openlp.git synced 2024-10-31 16:54:40 +00:00

fixed replacing background with video unblank screen even if it blanked to theme.

Fixes: https://launchpad.net/bugs/1225763
This commit is contained in:
Dmitriy Marmyshev 2013-09-18 08:50:07 +04:00
parent d9b2d33f05
commit 3910a582c0
2 changed files with 4 additions and 2 deletions

View File

@ -2,6 +2,7 @@
*.*~
\#*\#
*.eric4project
*.eric5project
*.ropeproject
*.e4*
.eric4project

View File

@ -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():