Head r852

openlp/core/lib/serviceitem.py

@@ -173,7 +173,7 @@ class ServiceItem(object):
             self.render_manager.set_override_theme(self.theme)
         format = self._display_frames[row][u'text'].split(u'\n')
         #if screen blank then do not display footer
-        if self.cache[row] is not None:
+        if len(self.cache) > 0 and self.cache[row] is not None:
             frame = self.cache[row]
         else:
             if format[0]:

openlp/core/ui/serviceitemeditform.py

@@ -96,6 +96,7 @@ class ServiceItemEditForm(QtGui.QDialog, Ui_ServiceItemEditDialog):
                 self.itemList.remove(self.itemList[row])
                 self.itemList.insert(row - 1, temp)
                 self.loadData()
+                self.listWidget.setCurrentRow(row - 1)
 
     def onItemDown(self):
         """
@@ -109,3 +110,4 @@ class ServiceItemEditForm(QtGui.QDialog, Ui_ServiceItemEditDialog):
                 self.itemList.remove(self.itemList[row])
                 self.itemList.insert(row + 1, temp)
                 self.loadData()
+                self.listWidget.setCurrentRow(row + 1)

openlp/core/ui/slidecontroller.py

@@ -536,7 +536,7 @@ class SlideController(QtGui.QWidget):
         self.PreviewListWidget.setCursor(QtCore.Qt.PointingHandCursor)
         before = time.time()
         #Clear the old serviceItem cache to release memory
-        if self.serviceItem:
+        if self.serviceItem and self.serviceItem is not serviceItem:
             self.serviceItem.cache = []
         self.serviceItem = serviceItem
         self.PreviewListWidget.clear()

openlp/plugins/bibles/lib/mediaitem.py

@@ -568,6 +568,10 @@ class BibleMediaItem(MediaManagerItem):
             raw_slides.append(bible_text)
         for slide in raw_slides:
             service_item.add_from_text(slide[:30], slide)
+        if service_item.raw_footer:
+            for foot in raw_footer:
+                service_item.raw_footer.append(foot)
+        else:
             service_item.raw_footer = raw_footer
         return True