From cbb17039d5ddef041f003027a099ba4e96874598 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 16 Oct 2009 19:22:14 +0100 Subject: [PATCH] Fix missing serviceitem handling --- openlp/core/ui/slidecontroller.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 6227a29a6..1f4e47ce3 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -331,12 +331,13 @@ class SlideController(QtGui.QWidget): """ Blank the screen. """ - if self.commandItem.service_item_type == ServiceType.Command: + if self.commandItem is not None and \ + self.commandItem.service_item_type == ServiceType.Command: if blanked: Receiver().send_message(u'%s_blank'% self.commandItem.name.lower()) else: Receiver().send_message(u'%s_unblank'% self.commandItem.name.lower()) - else: + else: self.parent.mainDisplay.blankDisplay() def onSlideSelected(self): @@ -347,7 +348,7 @@ class SlideController(QtGui.QWidget): row = self.PreviewListWidget.currentRow() if row > -1 and row < self.PreviewListWidget.rowCount(): if self.commandItem.service_item_type == ServiceType.Command: - Receiver().send_message(u'%s_slide'% self.commandItem.name.lower(), [row]) + Receiver().send_message(u'%s_slide'% self.commandItem.name.lower(), [row]) else: #label = self.PreviewListWidget.cellWidget(row, 0) frame = self.serviceitem.frames[row][u'image']