From 48da5da39317bd8de8d168be16b5ebc002d0ce6c Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Fri, 29 Mar 2019 21:15:08 +0100
Subject: [PATCH] Avoid crash during shutdown

---
 src/blackcore/simulator.cpp                        | 7 +++----
 src/blackgui/components/infobarstatuscomponent.cpp | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/blackcore/simulator.cpp b/src/blackcore/simulator.cpp
index 94ced5ff3..5c22d2e09 100644
--- a/src/blackcore/simulator.cpp
+++ b/src/blackcore/simulator.cpp
@@ -1137,13 +1137,12 @@ namespace BlackCore
         this->reverseLookupAndUpdateOwnAircraftModel(model);
     }
 
-    void ISimulator::reverseLookupAndUpdateOwnAircraftModel(const BlackMisc::Simulation::CAircraftModel &model)
+    void ISimulator::reverseLookupAndUpdateOwnAircraftModel(const CAircraftModel &model)
     {
-        Q_ASSERT_X(sApp, Q_FUNC_INFO, "Missing sApp");
-        Q_ASSERT_X(sApp->hasWebDataServices(), Q_FUNC_INFO, "Missing web services");
-
         if (!model.hasModelString()) { return; }
         if (this->isShuttingDown())  { return; }
+        Q_ASSERT_X(sApp->hasWebDataServices(), Q_FUNC_INFO, "Missing web services");
+
         if (this->getOwnAircraftModel() != model)
         {
             if (CDatabaseUtils::hasDbAircraftData())
diff --git a/src/blackgui/components/infobarstatuscomponent.cpp b/src/blackgui/components/infobarstatuscomponent.cpp
index 7319372e7..978c939d2 100644
--- a/src/blackgui/components/infobarstatuscomponent.cpp
+++ b/src/blackgui/components/infobarstatuscomponent.cpp
@@ -150,6 +150,7 @@ namespace BlackGui
 
         void CInfoBarStatusComponent::onSimulatorStatusChanged(int status)
         {
+            if (!sGui || sGui->isShuttingDown()) { return; }
             const ISimulator::SimulatorStatus simStatus = static_cast<ISimulator::SimulatorStatus>(status);
             if (simStatus.testFlag(ISimulator::Connected))
             {