From 580de0015f9fc1cf7dde4d8f320866e5dc3ee0dc Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 2 Dec 2012 08:06:08 +0000 Subject: [PATCH] Fix background video --- openlp/core/ui/media/mediacontroller.py | 2 +- openlp/plugins/media/lib/mediaitem.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index c124d7ce5..706a30d4c 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -642,7 +642,7 @@ class MediaController(object): log.debug(u'media_reset') self.set_controls_visible(controller, False) display = self._define_display(controller) - if display in self.currentMediaPlayer: + if controller.controllerType in self.currentMediaPlayer: display.override = {} self.currentMediaPlayer[controller.controllerType].reset(display) self.currentMediaPlayer[controller.controllerType] \ diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index daddefc17..2dadfac05 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -167,8 +167,7 @@ class MediaMediaItem(MediaManagerItem): filename = unicode(item.data(QtCore.Qt.UserRole).toString()) if os.path.exists(filename): service_item = ServiceItem() - service_item.title = \ - unicode(self.displayTypeComboBox.currentText()) + service_item.title = u'webkit' service_item.shortname = service_item.title (path, name) = os.path.split(filename) service_item.add_from_command(path, name,CLAPPERBOARD)