Merge lp:~raoul-snyman/openlp/bug-812289 into lp:openlp

[Raoul Snyman]

Fixed bug #812289. Forced the mediaitem to get the QListWidgetItem from the list again.

Fixed bug #812289. Forced the mediaitem to get the QListWidgetItem from the list again.

[Tim Bentley (trb143)]

review: Approve

=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py	2011-09-04 12:04:44 +0000
+++ openlp/plugins/songs/forms/editsongform.py	2011-09-22 20:44:38 +0000
@@ -682,7 +682,7 @@
         text = unicode(self.songBookComboBox.currentText())
         if item == 0 and text:
             temp_song_book = text
-        self.mediaitem.song_maintenance_form.exec_()
+        self.mediaitem.songMaintenanceForm.exec_()
         self.loadAuthors()
         self.loadBooks()
         self.loadTopics()
 
=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py	2011-09-16 08:15:37 +0000
+++ openlp/plugins/songs/lib/mediaitem.py	2011-09-22 20:44:38 +0000
@@ -428,8 +428,11 @@
 
     def generateSlideData(self, service_item, item=None, xmlVersion=False,
         remote=False):
-        log.debug(u'generateSlideData (%s:%s)' % (service_item, item))
-        item_id = self._getIdOfItemToGenerate(item, self.remoteSong)
+        log.debug(u'generateSlideData: %s, %s, %s' % (service_item, item, self.remoteSong))
+        # The ``None`` below is a workaround for bug #812289 - I think that Qt
+        # deletes the item somewhere along the line because the user is taking
+        # so long to update their item (or something weird like that).
+        item_id = self._getIdOfItemToGenerate(None, self.remoteSong)
         service_item.add_capability(ItemCapabilities.CanEdit)
         service_item.add_capability(ItemCapabilities.CanPreview)
         service_item.add_capability(ItemCapabilities.CanLoop)