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

No ASSERT without callsign, just VERIFY/ignore

Browse Source 
https://discordapp.com/channels/539048679160676382/568904623151382546/575712119513677826
This commit is contained in:
Klaus Basan
2019-05-08 20:11:27 +02:00
parent b9634f9927
commit 94e65e3bc4
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/blackcore/simulator.cpp
View File

@@ -11,10 +11,11 @@
#include "blackcore/webdataservices.h" #include "blackcore/webdataservices.h"
#include "blackcore/application.h" #include "blackcore/application.h"
#include "blackmisc/simulation/data/modelcaches.h" #include "blackmisc/simulation/data/modelcaches.h"
#include "blackmisc/math/mathutils.h"
#include "blackmisc/directoryutils.h" #include "blackmisc/directoryutils.h"
#include "blackmisc/threadutils.h" #include "blackmisc/threadutils.h"
#include "blackmisc/logmessage.h" #include "blackmisc/logmessage.h"
#include "blackmisc/math/mathutils.h" #include "blackmisc/verify.h"
#include <QFlag> #include <QFlag>
#include <Qt> #include <Qt>
@@ -601,13 +602,20 @@ namespace BlackCore
void ISimulator::rememberLastSent(const CAircraftSituation &sent) void ISimulator::rememberLastSent(const CAircraftSituation &sent)
{ {
Q_ASSERT_X(sent.hasCallsign(), Q_FUNC_INFO, "Need callsign"); // normally we should never end up without callsign, but it has happened in real world scenarios
// https://discordapp.com/channels/539048679160676382/568904623151382546/575712119513677826
const bool hasCs = sent.hasCallsign();
BLACK_VERIFY_X(hasCs, Q_FUNC_INFO, "Need callsign");
if (!hasCs) { return; }
m_lastSentSituations.insert(sent.getCallsign(), sent); m_lastSentSituations.insert(sent.getCallsign(), sent);
} }
void ISimulator::rememberLastSent(const CAircraftParts &sent, const CCallsign &callsign) void ISimulator::rememberLastSent(const CAircraftParts &sent, const CCallsign &callsign)
{ {
Q_ASSERT_X(!callsign.isEmpty(), Q_FUNC_INFO, "Need callsign"); // normally we should never end up without callsign, but it has happened in real world scenarios
// https://discordapp.com/channels/539048679160676382/568904623151382546/575712119513677826
BLACK_VERIFY_X(!callsign.isEmpty(), Q_FUNC_INFO, "Need callsign");
if (callsign.isEmpty()) { return; }
m_lastSentParts.insert(callsign, sent); m_lastSentParts.insert(callsign, sent);
} }