flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-26 02:35:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T341, crash prevention as seen in https://crashreports.swift-project.org/crashreports/81

Browse Source
This commit is contained in:
Klaus Basan
2018-09-06 20:57:26 +02:00
parent 55690846fe
commit 4406174668
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/blackcore/application.cpp
View File

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