openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/bug-854171 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #854171 in OpenLP: "OpenLP crashes when switching from override display to no override and back again"
  https://bugs.launchpad.net/openlp/+bug/854171

For more details, see:
https://code.launchpad.net/~trb143/openlp/bug-854171/+merge/76248

Fix crash on service load of some people.

Fix loop on config exit under extreme activities!
-- 
https://code.launchpad.net/~trb143/openlp/bug-854171/+merge/76248
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/bug-854171 into lp:openlp.

=== modified file 'openlp/core/lib/__init__.py'
--- openlp/core/lib/__init__.py	2011-08-28 17:45:13 +0000
+++ openlp/core/lib/__init__.py	2011-09-20 15:47:24 +0000
@@ -185,7 +185,7 @@
     new_image = QtGui.QImage(width, height,
         QtGui.QImage.Format_ARGB32_Premultiplied)
     painter = QtGui.QPainter(new_image)
-    painter.fillRect(new_image.rect(), background)
+    painter.fillRect(new_image.rect(), QtGui.QColor(background))
     painter.drawImage((width - realw) / 2, (height - realh) / 2, preview)
     return new_image
 

=== modified file 'openlp/core/lib/imagemanager.py'
--- openlp/core/lib/imagemanager.py	2011-08-21 18:02:58 +0000
+++ openlp/core/lib/imagemanager.py	2011-09-20 15:47:24 +0000
@@ -215,6 +215,8 @@
         image = self._cache[name]
         if image.image is None:
             self._conversion_queue.modify_priority(image, Priority.High)
+            # make sure we are running and if not give it a kick
+            self.process_updates()
             while image.image is None:
                 log.debug(u'get_image - waiting')
                 time.sleep(0.1)
@@ -235,6 +237,8 @@
         image = self._cache[name]
         if image.image_bytes is None:
             self._conversion_queue.modify_priority(image, Priority.Urgent)
+            # make sure we are running and if not give it a kick
+            self.process_updates()
             while image.image_bytes is None:
                 log.debug(u'get_image_bytes - waiting')
                 time.sleep(0.1)