openlp-core team mailing list archive

[Jonathan Corwin <j@xxxxxxxxxxxx>]

Jonathan Corwin has proposed merging lp:~j-corwin/openlp/remote into lp:openlp.

Requested reviews:
  Andreas Preikschat (googol-hush)
Related bugs:
  Bug #596995 in OpenLP: "Remotes Plugin does not work with PPA version"
  https://bugs.launchpad.net/openlp/+bug/596995

For more details, see:
https://code.launchpad.net/~j-corwin/openlp/remote/+merge/61462

Fix song editing, which I broke. Oops. Sorry.
-- 
https://code.launchpad.net/~j-corwin/openlp/remote/+merge/61462
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py	2011-05-15 20:34:32 +0000
+++ openlp/plugins/songs/lib/mediaitem.py	2011-05-18 19:04:29 +0000
@@ -221,8 +221,7 @@
         # Push edits to the service manager to update items
         if self.editItem and self.updateServiceOnEdit and \
             not self.remoteTriggered:
-            item_id = _getIdOfItemToGenerate(self.editItem)
-            item = self.buildServiceItem(item_id)
+            item = self.buildServiceItem(self.editItem)
             self.parent.serviceManager.replaceServiceItem(item)
         self.onRemoteEditClear()
         self.onSearchTextButtonClick()