From 4eeaf1adc4f107b7abfeda99a608af2c27112e96 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sun, 27 May 2018 00:04:00 +0200
Subject: [PATCH] Smaller adjustments of unit test and application

---
 src/blackcore/application.cpp                      | 4 +++-
 src/blackcore/application.h                        | 6 +++---
 src/blackgui/components/dbownmodelsetcomponent.cpp | 2 +-
 tests/blackcore/main.cpp                           | 7 +++----
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/blackcore/application.cpp b/src/blackcore/application.cpp
index 88806a869..8dbc8ea08 100644
--- a/src/blackcore/application.cpp
+++ b/src/blackcore/application.cpp
@@ -359,8 +359,10 @@ namespace BlackCore
             // crashpad dump
             if (this->isSet(m_cmdTestCrashpad))
             {
+                QPointer<CApplication> myself(this);
                 QTimer::singleShot(10 * 1000, [ = ]
                 {
+                    if (!myself) { return; }
 #ifdef BLACK_USE_CRASHPAD
                     CRASHPAD_SIMULATE_CRASH();
 #else
@@ -547,7 +549,7 @@ namespace BlackCore
                CSettingsCache::instance()->saveToStore(keys);
     }
 
-    QString CApplication::getTemporaryDirectory() const
+    QString CApplication::getTemporaryDirectory()
     {
         static const QTemporaryDir tempDir;
         if (tempDir.isValid()) { return tempDir.path(); }
diff --git a/src/blackcore/application.h b/src/blackcore/application.h
index 2c65c6bdb..ce0531bbb 100644
--- a/src/blackcore/application.h
+++ b/src/blackcore/application.h
@@ -184,12 +184,12 @@ namespace BlackCore
         //! Comprehensive info
         QString getInfoString(const QString &separator) const;
 
-        //! Directory for temporary files
-        QString getTemporaryDirectory() const;
-
         //! Stop and restart application
         void restartApplication(const QStringList &newArguments = {}, const QStringList &removeArguments = {});
 
+        //! Directory for temporary files
+        static QString getTemporaryDirectory();
+
         //! Register as running
         //! \note Normally done automatically when CApplication::exec is called
         static bool registerAsRunning();
diff --git a/src/blackgui/components/dbownmodelsetcomponent.cpp b/src/blackgui/components/dbownmodelsetcomponent.cpp
index 9e976c19d..04ecb4877 100644
--- a/src/blackgui/components/dbownmodelsetcomponent.cpp
+++ b/src/blackgui/components/dbownmodelsetcomponent.cpp
@@ -334,7 +334,7 @@ namespace BlackGui
         void CDbOwnModelSetComponent::showAirlineAircraftMatrix() const
         {
             const CAircraftModelList set(this->getModelSetFromView());
-            const QString file = CAircraftModelUtilities::createIcaoAirlineAircraftHtmlMatrixFile(set, sGui->getTemporaryDirectory());
+            const QString file = CAircraftModelUtilities::createIcaoAirlineAircraftHtmlMatrixFile(set, CGuiApplication::getTemporaryDirectory());
             if (file.isEmpty()) { return; }
             QDesktopServices::openUrl(QUrl::fromLocalFile(file));
         }
diff --git a/tests/blackcore/main.cpp b/tests/blackcore/main.cpp
index 0af96b61b..85797148b 100644
--- a/tests/blackcore/main.cpp
+++ b/tests/blackcore/main.cpp
@@ -32,12 +32,11 @@ int main(int argc, char *argv[])
     a.addVatlibOptions();
     const bool setup = a.parseAndSynchronizeSetup();
     if (!setup) { qWarning() << "No setup loaded"; }
-    if (!a.start())
+    int r = EXIT_FAILURE;
+    if (a.start())
     {
-        a.gracefulShutdown();
-        return EXIT_FAILURE;
+        r = CBlackCoreTestMain::unitMain(argc, argv);
     }
-    const int r = CBlackCoreTestMain::unitMain(argc, argv);
     a.gracefulShutdown();
     return r;
 }