From e87556a7534a01e330e2ccc92b9a64191b69b16c Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Sat, 11 Apr 2015 21:20:21 +0200 Subject: [PATCH] Send default model string if model is empty For a strange reason swift was sending its own name and version instead. --- src/blackcore/network_vatlib.cpp | 4 ++-- src/blackcore/network_vatlib.h | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/blackcore/network_vatlib.cpp b/src/blackcore/network_vatlib.cpp index 09d58f846..56190b540 100644 --- a/src/blackcore/network_vatlib.cpp +++ b/src/blackcore/network_vatlib.cpp @@ -585,7 +585,7 @@ namespace BlackCore Q_ASSERT_X(isConnected(), "CNetworkVatlib", "Can't send to server when disconnected"); CAircraftIcao icao = ownAircraft().getIcaoInfo(); QString modelString = ownAircraft().getModel().getModelString(); - if (modelString.isEmpty()) { modelString = CProject::systemNameAndVersion(); } + if (modelString.isEmpty()) { modelString = defaultModelString(); } QStringList data { { "0" }, icao.getAirlineDesignator(), icao.getAircraftDesignator(), { "" }, { "" }, { "" }, { "" }, icao.getAircraftCombinedType(), modelString }; @@ -597,7 +597,7 @@ namespace BlackCore Q_ASSERT_X(isConnected(), "CNetworkVatlib", "Can't send to server when disconnected"); CAircraftIcao icao = ownAircraft().getIcaoInfo(); QString modelString = ownAircraft().getModel().getModelString(); - if (modelString.isEmpty()) { modelString = CProject::systemNameAndVersion(); } + if (modelString.isEmpty()) { modelString = defaultModelString(); } QStringList data { { "0" }, icao.getAirlineDesignator(), icao.getAircraftDesignator(), { "" }, { "" }, { "" }, { "" }, icao.getAircraftCombinedType(), modelString }; diff --git a/src/blackcore/network_vatlib.h b/src/blackcore/network_vatlib.h index d25ca7407..5217a114a 100644 --- a/src/blackcore/network_vatlib.h +++ b/src/blackcore/network_vatlib.h @@ -133,6 +133,11 @@ namespace BlackCore static VatSimType convertToSimType(BlackMisc::Simulation::CSimulatorPluginInfo &simInfo); static void networkLogHandler(SeverityLevel severity, const char *message); + inline QString defaultModelString() + { + return QStringLiteral("Cessna Skyhawk 172SP"); + } + struct JsonPackets { static QJsonObject aircraftConfigRequest();