Fix bug #1845, closing the Qt launcher

Intercept the close event and quit the app instead of continuing to
run the main FlightGear application.

https://sourceforge.net/p/flightgear/codetickets/1845/

diff --git a/src/GUI/QtLauncher.cxx b/src/GUI/QtLauncher.cxx
index 2a8b049c0b80b86db4755103fea305c2205b91ff..3cc0f201dba2fae489035467ecaef232a700735a 100644 (file)
--- a/src/GUI/QtLauncher.cxx
+++ b/src/GUI/QtLauncher.cxx
@@ -725,6 +725,11 @@ void QtLauncher::setEnableDisableOptionFromCheckbox(QCheckBox* cbox, QString nam
     }
 }
 
+void QtLauncher::closeEvent(QCloseEvent *event)
+{
+    qApp->exit(-1);
+}
+
 void QtLauncher::onRun()
 {
     flightgear::Options* opt = flightgear::Options::sharedInstance();

diff --git a/src/GUI/QtLauncher_private.hxx b/src/GUI/QtLauncher_private.hxx
index f5eea7adeab3022a46f90cd89267884139517dee..c2a06b6395136a4cadcd05ef18ba8bb71ce2a7be 100644 (file)
--- a/src/GUI/QtLauncher_private.hxx
+++ b/src/GUI/QtLauncher_private.hxx
@@ -53,6 +53,10 @@ public:
 
     void setSceneryPaths();
 
+protected:
+    virtual void closeEvent(QCloseEvent *event);
+
+
 private slots:
     // run is used when the launcher is invoked before the main app is
     // started