openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/bug-855368 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~trb143/openlp/bug-855368/+merge/76858

Fix DND bug 
-- 
https://code.launchpad.net/~trb143/openlp/bug-855368/+merge/76858
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/bug-855368 into lp:openlp.

=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py	2011-09-23 06:43:06 +0000
+++ openlp/plugins/songs/lib/mediaitem.py	2011-09-24 15:24:24 +0000
@@ -428,11 +428,9 @@
 
     def generateSlideData(self, service_item, item=None, xmlVersion=False,
         remote=False):
-        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)
+        log.debug(u'generateSlideData: %s, %s, %s' %
+            (service_item, item, self.remoteSong))
+        item_id = self._getIdOfItemToGenerate(item, self.remoteSong)
         service_item.add_capability(ItemCapabilities.CanEdit)
         service_item.add_capability(ItemCapabilities.CanPreview)
         service_item.add_capability(ItemCapabilities.CanLoop)