From b320733e454452251a2c8ac552e07c1e0dabed2d Mon Sep 17 00:00:00 2001
From: Pieter van der Kloet <pvdkloet@gmail.com>
Date: Tue, 28 Feb 2012 21:00:02 +0100
Subject: [PATCH] Fixed Qt exits, this time for all occurrences

---
 apps/launcher/datafilespage.cpp |  6 ++++--
 apps/launcher/graphicspage.cpp  | 11 ++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index d3968f2bf..b0d9779d5 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -1015,7 +1015,8 @@ void DataFilesPage::writeConfig(QString profile)
         Please make sure you have the right permissions and try again.<br>").arg(file.fileName()));
         msgBox.exec();
 
-        QApplication::exit(1);
+        qApp->exit(1);
+        return;
     }
 
     QTextStream in(&file);
@@ -1041,7 +1042,8 @@ void DataFilesPage::writeConfig(QString profile)
         Please make sure you have the right permissions and try again.<br>").arg(file.fileName()));
         msgBox.exec();
 
-        QApplication::exit(1);
+        qApp->exit(1);
+        return;
     }
 
     file.write(buffer);
diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp
index c9dca1879..aaa54dd7f 100644
--- a/apps/launcher/graphicspage.cpp
+++ b/apps/launcher/graphicspage.cpp
@@ -180,7 +180,7 @@ void GraphicsPage::setupOgre()
         Make sure you have write access to<br>%1<br><br>")).arg(configDir.path()));
         msgBox.exec();
 
-        QApplication::exit(1);
+        qApp->exit(1);
         return;
     }
 
@@ -203,7 +203,7 @@ void GraphicsPage::setupOgre()
 
         qCritical("Error creating Ogre::Root, the error reported was:\n %s", qPrintable(ogreError));
 
-        QApplication::exit(1);
+        qApp->exit(1);
         return;
     }
 
@@ -237,7 +237,7 @@ void GraphicsPage::setupOgre()
         Please make sure the plugins.cfg file exists and contains a valid rendering plugin.<br>"));
         msgBox.exec();
 
-        QApplication::exit(1);
+        qApp->exit(1);
         return;
     }
 
@@ -423,7 +423,7 @@ void GraphicsPage::writeConfig()
 
         qCritical("Error validating configuration");
 
-        QApplication::exit(1);
+        qApp->exit(1);
         return;
     }
 
@@ -449,7 +449,8 @@ void GraphicsPage::writeConfig()
 
         qCritical("Error saving Ogre configuration, the error reported was:\n %s", qPrintable(ogreError));
 
-        QApplication::exit(1);
+        qApp->exit(1);
+        return;
     }
 
 }