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

Shutdown guard

Browse Source
This commit is contained in:
Klaus Basan
2018-05-10 03:58:08 +02:00
parent 47afc4d6fc
commit 43cc99710a
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/blackgui/components/aircraftpartshistory.cpp
View File

@@ -56,6 +56,7 @@ namespace BlackGui
void CAircraftPartsHistory::initGui() void CAircraftPartsHistory::initGui()
{ {
if (!sGui || sGui->isShuttingDown() || !sGui->getIContextNetwork()) { return; }
const bool needCallsigns = this->partsHistoryEnabled(); const bool needCallsigns = this->partsHistoryEnabled();
if (needCallsigns && !m_timerUpdateHistory.isActive()) if (needCallsigns && !m_timerUpdateHistory.isActive())
{ {

8
src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
View File

@@ -309,8 +309,10 @@ namespace BlackSimPlugin
void CSimulatorFsxCommon::onSimRunning() void CSimulatorFsxCommon::onSimRunning()
{ {
const QPointer<CSimulatorFsxCommon> myself(this);
QTimer::singleShot(DeferSimulatingFlagMs, this, [ = ] QTimer::singleShot(DeferSimulatingFlagMs, this, [ = ]
{ {
if (myself.isNull()) { return; }
m_simulatingChangedTs = QDateTime::currentMSecsSinceEpoch(); m_simulatingChangedTs = QDateTime::currentMSecsSinceEpoch();
this->onSimRunningDefered(m_simulatingChangedTs); this->onSimRunningDefered(m_simulatingChangedTs);
}); });
@@ -567,9 +569,11 @@ namespace BlackSimPlugin
// we know the object has been created. But it can happen it is directly removed afterwards // we know the object has been created. But it can happen it is directly removed afterwards
const CSimulatedAircraft verifyAircraft(simObject.getAircraft()); const CSimulatedAircraft verifyAircraft(simObject.getAircraft());
const QPointer<CSimulatorFsxCommon> myself(this);
QTimer::singleShot(1000, this, [ = ] QTimer::singleShot(1000, this, [ = ]
{ {
// also triggers new add if required // also triggers new add if required
if (myself.isNull()) { return; }
this->verifyAddedRemoteAircraft(verifyAircraft); this->verifyAddedRemoteAircraft(verifyAircraft);
}); });
return true; return true;
@@ -1099,10 +1103,10 @@ namespace BlackSimPlugin
} }
// cleanup function, actually this should not be needed // cleanup function, actually this should not be needed
const QPointer<CSimulatorFsxCommon> guard(this); const QPointer<CSimulatorFsxCommon> myself(this);
QTimer::singleShot(100, this, [ = ] QTimer::singleShot(100, this, [ = ]
{ {
if (guard.isNull()) { return; } if (myself.isNull()) { return; }
CSimulatorFsxCommon::physicallyRemoveAircraftNotInProvider(); CSimulatorFsxCommon::physicallyRemoveAircraftNotInProvider();
}); });