From bfee664c94b3daa5cbf1483aae5bbaca534358ec Mon Sep 17 00:00:00 2001 From: Jonathan Corwin Date: Wed, 10 Mar 2010 23:00:48 +0000 Subject: [PATCH] fixes --- openlp/core/ui/slidecontroller.py | 6 +++++- openlp/plugins/presentations/lib/messagelistener.py | 7 ++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 0143be4cf..a8f33baea 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -412,9 +412,13 @@ class SlideController(QtGui.QWidget): if item.is_media(): self.onMediaStart(item) elif item.is_command(): + if self.isLive: + blanked = self.blankButton.isChecked() + else: + blanked = False Receiver.send_message(u'%s_start' % item.name.lower(), \ [item.title, item.service_item_path, - item.get_frame_title(), slideno, self.isLive, self.blankButton.isChecked()]) + item.get_frame_title(), slideno, self.isLive, blanked]) self.displayServiceManagerItems(item, slideno) def displayServiceManagerItems(self, serviceItem, slideno): diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py index c3c9a91f5..08aa7e73a 100644 --- a/openlp/plugins/presentations/lib/messagelistener.py +++ b/openlp/plugins/presentations/lib/messagelistener.py @@ -218,11 +218,12 @@ class MessageListener(object): self.handler = self.mediaitem.findControllerByType(file) if not self.handler: return - + if isLive: - self.liveHandler.addHandler(self.controllers[self.handler], file, isBlank) + controller = self.liveHandler else: - self.previewHandler.addHandler(self.controllers[self.handler], file) + controller = self.previewHandler + controller.addHandler(self.controllers[self.handler], file, isBlank) def slide(self, message): slide, live = self.splitMessage(message)