From cec94e28195ebd92ccca76cc9b3a68a51e8eae99 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Wed, 24 Jan 2018 01:29:54 +0100
Subject: [PATCH] Make sure SwiftGuiStd::reloadOwnAircraft is not called during
 shutdown

---
 src/swiftguistandard/swiftguistdaircraft.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/swiftguistandard/swiftguistdaircraft.cpp b/src/swiftguistandard/swiftguistdaircraft.cpp
index 44d03bc6a..8ed7ee6c5 100644
--- a/src/swiftguistandard/swiftguistdaircraft.cpp
+++ b/src/swiftguistandard/swiftguistdaircraft.cpp
@@ -34,17 +34,14 @@ using namespace BlackMisc::Audio;
 
 bool SwiftGuiStd::reloadOwnAircraft()
 {
-    if (!this->m_contextNetworkAvailable) { return false; }
+    if (!sApp || sApp->isShuttingDown())  { return false; }
+    if (!sApp->getIContextOwnAircraft() || !sApp->getIContextNetwork()) { return false; }
 
     // check for changed aircraft
-    bool changed = false;
-    CSimulatedAircraft loadedAircraft = sGui->getIContextOwnAircraft()->getOwnAircraft();
-    if (loadedAircraft != m_ownAircraft)
-    {
-        m_ownAircraft = loadedAircraft;
-        changed = true;
-    }
-    return changed;
+    const CSimulatedAircraft contextAircraft = sGui->getIContextOwnAircraft()->getOwnAircraft();
+    if (contextAircraft == m_ownAircraft) { return false; }
+    m_ownAircraft = contextAircraft;
+    return true;
 }
 
 void SwiftGuiStd::setTestPosition(const QString &wgsLatitude, const QString &wgsLongitude, const CAltitude &altitude, const CAltitude &pressureAltitude)