From b576e21b4801ccc47d4e217e2833bc21be335d8a Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 8 Sep 2014 23:26:04 +0200 Subject: [PATCH] Workaround for assert in FSX plugin, refs #324 --- src/plugins/simulator/fsx/simulator_fsx.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/plugins/simulator/fsx/simulator_fsx.cpp b/src/plugins/simulator/fsx/simulator_fsx.cpp index a04d3b4df..c26c75a8b 100644 --- a/src/plugins/simulator/fsx/simulator_fsx.cpp +++ b/src/plugins/simulator/fsx/simulator_fsx.cpp @@ -170,12 +170,15 @@ namespace BlackSimPlugin addAircraftSituation(callsign, initialSituation); } - void CSimulatorFsx::addAircraftSituation(const CCallsign &callsign, const CAircraftSituation &situation) + void CSimulatorFsx::addAircraftSituation(const CCallsign &callsign, const CAircraftSituation &initialSituation) { - Q_ASSERT(m_simConnectObjects.contains(callsign)); - + if (!m_simConnectObjects.contains(callsign)) { + // according to #324 this should not happen + Q_ASSERT(false); + this->addRemoteAircraft(callsign, initialSituation); + } CSimConnectObject simObj = m_simConnectObjects.value(callsign); - simObj.getInterpolator()->addAircraftSituation(situation); + simObj.getInterpolator()->addAircraftSituation(initialSituation); m_simConnectObjects.insert(callsign, simObj); }