openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol-hush/openlp/fixes into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #598393 in OpenLP: "After adding a new image to a selected (image) item in the service manager it is not selected anymore"
  https://bugs.launchpad.net/openlp/+bug/598393
  Bug #719102 in OpenLP: "editing author after editing song causes traceback"
  https://bugs.launchpad.net/openlp/+bug/719102
  Bug #730979 in OpenLP: "Song export crashes"
  https://bugs.launchpad.net/openlp/+bug/730979
  Bug #747206 in OpenLP: "Missing dictionary for spell check prevents program start"
  https://bugs.launchpad.net/openlp/+bug/747206
  Bug #754484 in OpenLP: "Update service from song edit doesn't work after restart"
  https://bugs.launchpad.net/openlp/+bug/754484

For more details, see:
https://code.launchpad.net/~googol-hush/openlp/fixes/+merge/56945

Hello,

- fixed bug #754484

The problem was, that we converted the id to an unicode string, thus the comparison in replaceServiceItem fails. Solution: just convert the id to an integer in the place where we receive the signal.
-- 
https://code.launchpad.net/~googol-hush/openlp/fixes/+merge/56945
Your team OpenLP Core is requested to review the proposed merge of lp:~googol-hush/openlp/fixes into lp:openlp.

=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py	2011-04-02 09:53:08 +0000
+++ openlp/core/ui/servicemanager.py	2011-04-08 14:07:12 +0000
@@ -1021,7 +1021,7 @@
         editId, uuid = message.split(u':')
         for item in self.serviceItems:
             if item[u'service_item']._uuid == uuid:
-                item[u'service_item'].edit_id = editId
+                item[u'service_item'].edit_id = int(editId)
         self.setModified(True)
 
     def replaceServiceItem(self, newItem):