openlp-core team mailing list archive

[phill <phill.ridout@xxxxxxxxxxxxxx>]

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

Requested reviews:
  OpenLP Core (openlp-core)

-- 
https://code.launchpad.net/~phill-ridout/openlp/fixes/+merge/30037
Your team OpenLP Core is requested to review the proposed merge of lp:~phill-ridout/openlp/fixes into lp:openlp.

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2010-07-08 08:14:10 +0000
+++ openlp/core/ui/maindisplay.py	2010-07-15 18:16:46 +0000
@@ -358,6 +358,8 @@
             else:
                 self.displayBlank.setPixmap(
                     QtGui.QPixmap.fromImage(self.blankFrame))
+        if mode != HideMode.Screen and self.isHidden():
+            self.setVisible(True)
 
     def showDisplay(self, message=u''):
         """
@@ -367,6 +369,8 @@
         """
         log.debug(u'showDisplay')
         self.displayBlank.setPixmap(self.transparent)
+        if self.isHidden():
+            self.setVisible(True)
         #Trigger actions when display is active again
         Receiver.send_message(u'maindisplay_active')