From 4406174668c3116ad8dc078d92d146475bb3fbcd Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Thu, 6 Sep 2018 20:57:26 +0200
Subject: [PATCH] Ref T341, crash prevention as seen in
 https://crashreports.swift-project.org/crashreports/81

---
 src/blackcore/application.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/blackcore/application.cpp b/src/blackcore/application.cpp
index bf410898d..864e1c3d5 100644
--- a/src/blackcore/application.cpp
+++ b/src/blackcore/application.cpp
@@ -1086,11 +1086,12 @@ namespace BlackCore
     void CApplication::onNetworkConfigurationsUpdateCompleted()
     {
         Q_ASSERT_X(m_networkConfigManager, Q_FUNC_INFO, "Need network config manager");
+        if (this->isShuttingDown()) { return; }
         const QList<QNetworkConfiguration> allConfigurations = m_networkConfigManager->allConfigurations();
         if (allConfigurations.isEmpty())
         {
             // this is an odd situation we cannot handle, network check will be disabled
-            if (m_networkWatchDog->isNetworkAccessibilityCheckEnabled())
+            if (m_networkWatchDog && m_networkWatchDog->isNetworkAccessibilityCheckEnabled())
             {
                 m_networkWatchDog->disableNetworkAccessibilityCheck(true);
                 m_accessManager->setNetworkAccessible(QNetworkAccessManager::Accessible);
@@ -1110,7 +1111,7 @@ namespace BlackCore
 
             const bool canStartIAP = (m_networkConfigManager->capabilities() & QNetworkConfigurationManager::CanStartAndStopInterfaces);
             const bool disable = activeCount < 1; // only inactive
-            if (disable && m_networkWatchDog->isNetworkAccessibilityCheckEnabled())
+            if (disable && m_networkWatchDog && m_networkWatchDog->isNetworkAccessibilityCheckEnabled())
             {
                 CLogMessage(this).warning("Disabling network accessibility check in watchdog");
                 m_networkWatchDog->disableNetworkAccessibilityCheck(disable);