From bdaaaa73730a9218625d4c039914363394c28ae9 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 23 Oct 2016 18:32:42 +0200 Subject: [PATCH] refs #780, avoid assert In the past we used one situation list, now a map (per callsign). The assert was checking if the callsign is really correct for that situation, now we can just set the callsign. --- src/blackmisc/interpolator.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/blackmisc/interpolator.cpp b/src/blackmisc/interpolator.cpp index 174b20a6e..ccaa1a345 100644 --- a/src/blackmisc/interpolator.cpp +++ b/src/blackmisc/interpolator.cpp @@ -33,8 +33,7 @@ namespace BlackMisc Q_ASSERT_X(!callsign.isEmpty(), Q_FUNC_INFO, "empty callsign"); auto currentSituation = this->getInterpolatedSituation(this->remoteAircraftSituations(callsign), currentTimeSinceEpoc, isVtolAircraft, status); - - Q_ASSERT_X(currentSituation.getCallsign() == callsign, Q_FUNC_INFO, "mismatching callsigns"); + currentSituation.setCallsign(callsign); // make sure callsign is correct return currentSituation; }