openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

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

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #836326 in OpenLP: "pressing escape hides/closes the main display"
  https://bugs.launchpad.net/openlp/+bug/836326

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

Only allow ESC if Primary dsiplay (ie 1 screen)

-- 
https://code.launchpad.net/~trb143/openlp/bug-836326/+merge/74861
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/bug-836326 into lp:openlp.

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2011-09-06 19:32:30 +0000
+++ openlp/core/ui/slidecontroller.py	2011-09-09 19:16:41 +0000
@@ -414,8 +414,9 @@
             translate('OpenLP.SlideController', 'Escape Item'))
 
     def liveEscape(self):
-        self.display.setVisible(False)
-        self.display.videoStop()
+        if self.display.primary:
+            self.display.setVisible(False)
+            self.display.videoStop()
 
     def servicePrevious(self):
         time.sleep(0.1)