diff --git a/openlp/core/lib/rendermanager.py b/openlp/core/lib/rendermanager.py index ddb8360da..a2beb1519 100644 --- a/openlp/core/lib/rendermanager.py +++ b/openlp/core/lib/rendermanager.py @@ -206,7 +206,7 @@ class RenderManager(object): footer.append(u'Public Domain') footer.append(u'CCLI 123456') formatted = self.renderer.format_slide(verse, False) - return self.renderer.generate_frame_from_lines(formatted[0], footer) + return self.renderer.generate_frame_from_lines(formatted[0], footer)[u'main'] def format_slide(self, words): """ diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py index 7cb3906ab..8f30499f5 100644 --- a/openlp/core/lib/serviceitem.py +++ b/openlp/core/lib/serviceitem.py @@ -293,7 +293,7 @@ class ServiceItem(object): if self.service_item_type == ServiceItemType.Text: return self.render_individual(row) else: - return self._raw_frames[row][u'image'] + return {u'main':self._raw_frames[row][u'image'], u'trans':None} def get_frame_title(self, row=0): """ diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index dac746967..0c8512b19 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -198,7 +198,7 @@ class MainDisplay(DisplayWidget): self.displayAlert() elif not self.displayBlank: if transition: - if self.hasTransition: + if self.hasTransition and self.frame[u'trans'] is not None: self.display.setPixmap(QtGui.QPixmap.fromImage(self.frame[u'trans'])) self.repaint() self.display.setPixmap(QtGui.QPixmap.fromImage(frame[u'trans']))