From 22a70e083ed24c128fb7a8c7af63d42a5eab624e Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Sun, 26 Jan 2020 21:03:52 +0100 Subject: [PATCH] [FG] Enhancing version compatibility check --- .../simulator/flightgear/fgswiftbusserviceproxy.cpp | 4 ++-- .../simulator/flightgear/fgswiftbusserviceproxy.h | 2 +- src/plugins/simulator/flightgear/simulatorflightgear.cpp | 9 ++++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.cpp b/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.cpp index 424022b59..a55dcbaa9 100644 --- a/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.cpp +++ b/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.cpp @@ -38,9 +38,9 @@ namespace BlackSimPlugin } } - QString CFGSwiftBusServiceProxy::getVersionNumber() + int CFGSwiftBusServiceProxy::getVersionNumber() { - return m_dbusInterface->callDBusRet(QLatin1String("getVersionNumber")); + return m_dbusInterface->callDBusRet(QLatin1String("getVersionNumber")); } void CFGSwiftBusServiceProxy::getOwnAircraftSituationData(FlightgearData *o_flightgearData) diff --git a/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.h b/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.h index f9db38b0a..6cc7d3376 100644 --- a/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.h +++ b/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.h @@ -98,7 +98,7 @@ namespace BlackSimPlugin public slots: //! Get Flightgear version number - QString getVersionNumber(); + int getVersionNumber(); //! Get own aircraft situation data void getOwnAircraftSituationData(FlightgearData *o_flightgearData); diff --git a/src/plugins/simulator/flightgear/simulatorflightgear.cpp b/src/plugins/simulator/flightgear/simulatorflightgear.cpp index d4a979cae..b8b394cb3 100644 --- a/src/plugins/simulator/flightgear/simulatorflightgear.cpp +++ b/src/plugins/simulator/flightgear/simulatorflightgear.cpp @@ -62,6 +62,8 @@ #include #include +#define FGSWIFTBUS_API_VERSION 1 + using namespace BlackConfig; using namespace BlackMisc; using namespace BlackMisc::Aviation; @@ -1020,12 +1022,9 @@ namespace BlackSimPlugin bool result = service.isValid() && traffic.isValid(); if (! result) { return; } - QString flightgearVersion = service.getVersionNumber(); - QString flightgearVersionMinimum = "2019.2.0"; - - if (flightgearVersion < flightgearVersionMinimum) + if (service.getVersionNumber() != FGSWIFTBUS_API_VERSION) { - CLogMessage(this).error(u"You are using Flightgear %1. This version of swift is only compatible with Flightgear %2 or newer. Consider upgrading!") << flightgearVersion << flightgearVersionMinimum; + CLogMessage(this).error(u"This version of swift is not compatible with this Flightgear version. For further information check http://wiki.flightgear.org/Swift."); return; } if (!traffic.initialize())