openlp/openlp
1
0
Fork 1
mirror of https://gitlab.com/openlp/openlp.git synced 2024-09-28 19:07:35 +00:00
Code Issues Projects Releases Wiki Activity

[fix] Don't exit OpenLP when you cancel the FRW from the Tools menu

Browse Source
This commit is contained in:
Raoul Snyman 2014-11-08 21:25:06 +02:00
parent dec7390ef5
commit 4f4c76ae8b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openlp/core/__init__.py
View File

@ -122,6 +122,9 @@ class OpenLP(OpenLPMixin, QtGui.QApplication):
ftw.initialize(screens) ftw.initialize(screens)
if ftw.exec_() == QtGui.QDialog.Accepted: if ftw.exec_() == QtGui.QDialog.Accepted:
Settings().setValue('core/has run wizard', True) Settings().setValue('core/has run wizard', True)
elif ftw.was_download_cancelled:
QtCore.QCoreApplication.exit()
sys.exit()
# Correct stylesheet bugs # Correct stylesheet bugs
application_stylesheet = '' application_stylesheet = ''
if not Settings().value('advanced/alternate rows'): if not Settings().value('advanced/alternate rows'):

3
openlp/core/ui/firsttimeform.py
View File

@ -292,9 +292,6 @@ class FirstTimeForm(QtGui.QWizard, UiFirstTimeWizard, RegistryProperties):
Process the triggering of the cancel button. Process the triggering of the cancel button.
""" """
self.was_download_cancelled = True self.was_download_cancelled = True
if not self.has_run_wizard:
QtCore.QCoreApplication.exit()
sys.exit()
if self.theme_screenshot_workers: if self.theme_screenshot_workers:
for worker in self.theme_screenshot_workers: for worker in self.theme_screenshot_workers:
worker.set_download_canceled(True) worker.set_download_canceled(True)