openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/bug-1147307-2.0 into lp:openlp/2.0.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1147307 in OpenLP: "Transtion + fast slide changes + ESC causes screen to open again"
  https://bugs.launchpad.net/openlp/+bug/1147307

For more details, see:
https://code.launchpad.net/~googol/openlp/bug-1147307-2.0/+merge/151809

Hello,

- fixed bug #1147307 (Transtion + fast slide changes + ESC causes screen to open again)
-- 
https://code.launchpad.net/~googol/openlp/bug-1147307-2.0/+merge/151809
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/bug-1147307-2.0 into lp:openlp/2.0.

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2012-12-30 19:41:40 +0000
+++ openlp/core/ui/maindisplay.py	2013-03-05 17:18:27 +0000
@@ -362,6 +362,7 @@
         Generates a preview of the image displayed.
         """
         log.debug(u'preview for %s', self.isLive)
+        was_visible = self.isVisible()
         Receiver.send_message(u'openlp_process_events')
         # We must have a service item to preview.
         if self.isLive and hasattr(self, u'serviceItem'):
@@ -380,7 +381,8 @@
         if self.isLive:
             if self.hideMode:
                 self.hideDisplay(self.hideMode)
-            else:
+            # Only continue if the visibility wasn't changed during method call.
+            elif was_visible == self.isVisible():
                 # Single screen active
                 if self.screens.display_count == 1:
                     # Only make visible if setting enabled.