Merge for John

bzr-revno: 517
2009-09-01 20:50:32 +01:00 · 2009-09-01 20:50:32 +01:00 · d1139653c5
parent 8df57d5bad 94dbcc1a28
commit d1139653c5
1 changed files with 7 additions and 1 deletions
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@ -500,8 +500,14 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
        monitor number does not exist.
        """
        screen_number = int(self.generalConfig.get_config(u'Monitor', 0))
-        if screen_number not in self.screenList:
+
+        monitor_exists = False
+        for screen in self.screenList:
+            if screen[u'number'] == screen_number:
+                monitor_exists = True
+        if not monitor_exists:
            screen_number = 0
+
        return screen_number

    def show(self):