OpenLP

Merge lp:~googol-deactivatedaccount/openlp/bug-884826 into lp:openlp

  1. bug-884826
  2. Merge into trunk
Proposed by Andreas Preikschat
Status: Merged
Approved by: Tim Bentley
Approved revision: 1794
Merged at revision: 1795
Proposed branch: lp:~googol-deactivatedaccount/openlp/bug-884826
Merge into: lp:openlp
Diff against target: 13 lines (+1/-2)
1 file modified
openlp/plugins/songs/lib/mediaitem.py (+1/-2)
To merge this branch: bzr merge lp:~googol-deactivatedaccount/openlp/bug-884826
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Review via email: mp+80944@code.launchpad.net

Description of the change

- fixed bug #884826 (Cloning songs does not work)

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/lib/mediaitem.py'
2--- openlp/plugins/songs/lib/mediaitem.py 2011-10-03 20:28:17 +0000
3+++ openlp/plugins/songs/lib/mediaitem.py 2011-11-01 19:29:24 +0000
4@@ -419,8 +419,7 @@
5 item_id = (self.editItem.data(QtCore.Qt.UserRole)).toInt()[0]
6 old_song = self.plugin.manager.get_object(Song, item_id)
7 song_xml = self.openLyrics.song_to_xml(old_song)
8- new_song_id = self.openLyrics.xml_to_song(song_xml)
9- new_song = self.plugin.manager.get_object(Song, new_song_id)
10+ new_song = self.openLyrics.xml_to_song(song_xml)
11 new_song.title = u'%s <%s>' % (new_song.title,
12 translate('SongsPlugin.MediaItem', 'copy',
13 'For song cloning'))