openlp-core team mailing list archive

[Jonathan Corwin <j@xxxxxxxxxxxx>]

Jonathan Corwin has proposed merging lp:~j-corwin/openlp/general into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  #634771 OpenLP 1.9.2+bzr1016-0ubuntu1~lucid1 does not start
  https://bugs.launchpad.net/bugs/634771
  #646718 Songbook, Number will not loaded, Title will not be saved
  https://bugs.launchpad.net/bugs/646718

For more details, see:
https://code.launchpad.net/~j-corwin/openlp/general/+merge/44963

Fix missing DesktopScreen: 
https://bugs.launchpad.net/openlp/+bug/672164/comments/9
-- 
https://code.launchpad.net/~j-corwin/openlp/general/+merge/44963
Your team OpenLP Core is requested to review the proposed merge of lp:~j-corwin/openlp/general into lp:openlp.

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2010-12-31 08:06:42 +0000
+++ openlp/core/ui/slidecontroller.py	2010-12-31 17:15:57 +0000
@@ -1042,7 +1042,8 @@
         if self.ThemeScreen.isChecked:
             self.ThemeScreen.setChecked(False)
             self.HideMenu.setDefaultAction(self.ThemeScreen)
-        if self.DesktopScreen.isChecked:
-            self.DesktopScreen.setChecked(False)
-            self.HideMenu.setDefaultAction(self.DesktopScreen)
+        if self.screens.display_count > 1:
+            if self.DesktopScreen.isChecked:
+                self.DesktopScreen.setChecked(False)
+                self.HideMenu.setDefaultAction(self.DesktopScreen)