Launcher: do not launch the simulator when closing the Qt launcher with ESC

diff --git a/src/GUI/QtLauncher.cxx b/src/GUI/QtLauncher.cxx
index 870d092da00cc52c9319f889e03eab34450b5cba..1cbcfb790c3d0b61c540c1501d34bc823d58ddaf 100644 (file)
--- a/src/GUI/QtLauncher.cxx
+++ b/src/GUI/QtLauncher.cxx
@@ -462,7 +462,7 @@ bool runLauncherDialog()
     // avoid double Apple menu and other weirdness if both Qt and OSG
     // try to initialise various Cocoa structures.
     flightgear::WindowBuilder::setPoseAsStandaloneApp(false);
-    
+
     QtLauncher dlg;
     dlg.show();
 
@@ -773,6 +773,11 @@ void QtLauncher::closeEvent(QCloseEvent *event)
     qApp->exit(-1);
 }
 
+void QtLauncher::reject()
+{
+    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 e53c7ba19d96f0d789c535c44929202042642431..3d9495c1fba991363fde45bdd56ac04508450077 100644 (file)
--- a/src/GUI/QtLauncher_private.hxx
+++ b/src/GUI/QtLauncher_private.hxx
@@ -56,7 +56,7 @@ public:
     static void restartTheApp(QStringList fgArgs);
 protected:
     virtual void closeEvent(QCloseEvent *event);
-
+    virtual void reject();
 
 private slots:
     // run is used when the launcher is invoked before the main app is