--------------i This line and the following will be ignored --------------

modified:
  openlp/core/ui/mainwindow.py
unknown:
  .dump
  bugfixes.py
  impress.py
  openlp.log.1
  openlp.log.2
  openlp.log.3
  openlp.log.4
  openlp.log.5
  profile.out
  renderer1.out
  test.py
  test1.pu
  test1.py
  .eric4project/project-apis.db
  openlp/plugins/presentations/lib/impresscontroller.py
  openlp/plugins/remotes/lib/remotetab.py
  resources/forms/lpr
  resources/forms/plugindialoglistform.py
  resources/forms/plugindialoglistform1.py
pending merges:
  Jon Tibble 2009-09-01 [merge] Merge for John
    Jon Tibble 2009-09-01 Fix index naming in screen fix
    Jon Tibble 2009-09-01 Fix display monitor test logic
    Tim Bentley 2009-09-01 [merge] Various changes see loog for details
    Tim Bentley 2009-08-29 [merge] Sort out SlideController
This commit is contained in:
Tim Bentley 2009-09-01 20:59:16 +01:00
commit 261351e27b
1 changed files with 7 additions and 1 deletions

View File

@ -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):