From c61f23370c09b4886d877e5579e3bac437ae3d60 Mon Sep 17 00:00:00 2001 From: "rimach crichter@web.de" Date: Wed, 20 Jul 2011 23:16:36 +0200 Subject: [PATCH] bugfixing --- openlp/core/ui/media/mediamanager.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/openlp/core/ui/media/mediamanager.py b/openlp/core/ui/media/mediamanager.py index 78c6caa8a..f83b62cd6 100644 --- a/openlp/core/ui/media/mediamanager.py +++ b/openlp/core/ui/media/mediamanager.py @@ -221,6 +221,8 @@ class MediaManager(object): After a new display is configured, all media related widget will be created too """ + # clean up possible running old media files + self.finalise() display.hasAudio = True if not self.withLivePreview and \ display == self.parent.liveController.previewDisplay: @@ -271,6 +273,8 @@ class MediaManager(object): isValid = self.check_file_type(controller, display) display = controller.display isValid = self.check_file_type(controller, display) + display.override[u'theme'] = u'' + display.override[u'video'] = True else: display = controller.previewDisplay isValid = self.check_file_type(controller, display) @@ -320,6 +324,10 @@ class MediaManager(object): controller = msg[0] for display in self.curDisplayMediaAPI.keys(): if display.controller == controller: + if controller.isLive: + if controller.hideMenu.defaultAction().isChecked(): + controller.hideMenu.defaultAction().trigger() + #Receiver.send_message(u'maindisplay_show') self.curDisplayMediaAPI[display].play(display) # Start Timer for ui updates if not self.Timer.isActive(): @@ -375,6 +383,7 @@ class MediaManager(object): log.debug(u'video_reset') for display in self.curDisplayMediaAPI.keys(): if display.controller == controller: + display.override = {} self.curDisplayMediaAPI[display].reset(display) del self.curDisplayMediaAPI[display] self.set_controls_visible(controller, False) @@ -440,3 +449,8 @@ class MediaManager(object): if not item in video_list: video_list.append(item) return video_list + + def finalise(self): + self.Timer.stop() + for controller in self.controller: + self.video_reset(controller)