openlp-core team mailing list archive

[phill <phill.ridout@xxxxxxxxxxxxxx>]

phill has proposed merging lp:~phill-ridout/openlp/fixes into lp:openlp.

Requested reviews:
  Raoul Snyman (raoul-snyman): comment placing
  Tim Bentley (trb143)
Related bugs:
  #609442 Display desktop turns off when an item is changed in the live controller
  https://bugs.launchpad.net/bugs/609442


Found and removed two lines, cant see any reason why those line are currently needed, but if you guys could make doubly sure. I've given it a good testing, and cant find any adverse affects!
-- 
https://code.launchpad.net/~phill-ridout/openlp/fixes/+merge/31062
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2010-07-27 09:32:52 +0000
+++ openlp/core/ui/maindisplay.py	2010-07-27 16:25:58 +0000
@@ -456,7 +456,7 @@
                 self.displayText.setPixmap(frame)
             else:
                 self.displayText.setPixmap(QtGui.QPixmap.fromImage(frame))
-        if not self.isVisible() and self.screens.display:
+        if not self.isVisible() and self.screens.current['primary']:
             self.setVisible(True)
 
 class VideoDisplay(Phonon.VideoWidget):