OpenLP

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

  1. bug-812289
  2. Merge into trunk
Proposed by Raoul Snyman
Status: Merged
Merged at revision: 1757
Proposed branch: lp:~raoul-snyman/openlp/bug-812289
Merge into: lp:openlp
Diff against target: 30 lines (+6/-3)
2 files modified
openlp/plugins/songs/forms/editsongform.py (+1/-1)
openlp/plugins/songs/lib/mediaitem.py (+5/-2)
To merge this branch: bzr merge lp:~raoul-snyman/openlp/bug-812289
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Review via email: mp+76653@code.launchpad.net

This proposal supersedes a proposal from 2011-09-22.

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/plugins/songs/forms/editsongform.py'
2--- openlp/plugins/songs/forms/editsongform.py 2011-09-04 12:04:44 +0000
3+++ openlp/plugins/songs/forms/editsongform.py 2011-09-22 20:44:38 +0000
4@@ -682,7 +682,7 @@
5 text = unicode(self.songBookComboBox.currentText())
6 if item == 0 and text:
7 temp_song_book = text
8- self.mediaitem.song_maintenance_form.exec_()
9+ self.mediaitem.songMaintenanceForm.exec_()
10 self.loadAuthors()
11 self.loadBooks()
12 self.loadTopics()
13
14=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
15--- openlp/plugins/songs/lib/mediaitem.py 2011-09-16 08:15:37 +0000
16+++ openlp/plugins/songs/lib/mediaitem.py 2011-09-22 20:44:38 +0000
17@@ -428,8 +428,11 @@
18
19 def generateSlideData(self, service_item, item=None, xmlVersion=False,
20 remote=False):
21- log.debug(u'generateSlideData (%s:%s)' % (service_item, item))
22- item_id = self._getIdOfItemToGenerate(item, self.remoteSong)
23+ log.debug(u'generateSlideData: %s, %s, %s' % (service_item, item, self.remoteSong))
24+ # The ``None`` below is a workaround for bug #812289 - I think that Qt
25+ # deletes the item somewhere along the line because the user is taking
26+ # so long to update their item (or something weird like that).
27+ item_id = self._getIdOfItemToGenerate(None, self.remoteSong)
28 service_item.add_capability(ItemCapabilities.CanEdit)
29 service_item.add_capability(ItemCapabilities.CanPreview)
30 service_item.add_capability(ItemCapabilities.CanLoop)