From 4f4c76ae8b061ed2719b5ba328ea6bb1721f16c0 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Sat, 8 Nov 2014 21:25:06 +0200 Subject: [PATCH] [fix] Don't exit OpenLP when you cancel the FRW from the Tools menu --- openlp/core/__init__.py | 3 +++ openlp/core/ui/firsttimeform.py | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openlp/core/__init__.py b/openlp/core/__init__.py index 37a713d38..9f5c69770 100644 --- a/openlp/core/__init__.py +++ b/openlp/core/__init__.py @@ -122,6 +122,9 @@ class OpenLP(OpenLPMixin, QtGui.QApplication): ftw.initialize(screens) if ftw.exec_() == QtGui.QDialog.Accepted: Settings().setValue('core/has run wizard', True) + elif ftw.was_download_cancelled: + QtCore.QCoreApplication.exit() + sys.exit() # Correct stylesheet bugs application_stylesheet = '' if not Settings().value('advanced/alternate rows'): diff --git a/openlp/core/ui/firsttimeform.py b/openlp/core/ui/firsttimeform.py index 5d3b91762..06a238fed 100644 --- a/openlp/core/ui/firsttimeform.py +++ b/openlp/core/ui/firsttimeform.py @@ -292,9 +292,6 @@ class FirstTimeForm(QtGui.QWizard, UiFirstTimeWizard, RegistryProperties): Process the triggering of the cancel button. """ self.was_download_cancelled = True - if not self.has_run_wizard: - QtCore.QCoreApplication.exit() - sys.exit() if self.theme_screenshot_workers: for worker in self.theme_screenshot_workers: worker.set_download_canceled(True)