openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/beta1 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #742636 in OpenLP: "Leading spaces in song titles are stripped"
  https://bugs.launchpad.net/openlp/+bug/742636
  Bug #775534 in OpenLP: "Display window is initially the same size as the primary screen, despite being on the secondary screen"
  https://bugs.launchpad.net/openlp/+bug/775534

For more details, see:
https://code.launchpad.net/~trb143/openlp/beta1/+merge/64310

Speed up as not all calls match!
-- 
https://code.launchpad.net/~trb143/openlp/beta1/+merge/64310
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/beta1 into lp:openlp.

=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py	2011-06-11 11:22:40 +0000
+++ openlp/core/ui/servicemanager.py	2011-06-11 17:19:25 +0000
@@ -1077,10 +1077,10 @@
         Using the service item passed replace the one with the same edit id
         if found.
         """
-        newItem.render()
         for itemcount, item in enumerate(self.serviceItems):
             if item[u'service_item'].edit_id == newItem.edit_id and \
                 item[u'service_item'].name == newItem.name:
+                newItem.render()
                 newItem.merge(item[u'service_item'])
                 item[u'service_item'] = newItem
                 self.repaintServiceList(itemcount + 1, 0)