From 34a61d1d698007bbf8998c5894286fa46f366c30 Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Tue, 27 Jul 2021 17:52:12 +0100 Subject: [PATCH] Issue #107 Flight plan aircraft type doesn't need to be in the DB --- src/blackgui/components/flightplancomponent.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/blackgui/components/flightplancomponent.cpp b/src/blackgui/components/flightplancomponent.cpp index bb3b7c2db..bdfb1032a 100644 --- a/src/blackgui/components/flightplancomponent.cpp +++ b/src/blackgui/components/flightplancomponent.cpp @@ -863,8 +863,13 @@ namespace BlackGui CAircraftIcaoCode CFlightPlanComponent::getAircraftIcaoCode() const { const QString designator(ui->le_AircraftType->text()); - if (!sApp || !sApp->hasWebDataServices() || !CAircraftIcaoCode::isValidDesignator(designator)) { return CAircraftIcaoCode(); } - return sApp->getWebDataServices()->getAircraftIcaoCodeForDesignator(designator); + if (!CAircraftIcaoCode::isValidDesignator(designator)) { return CAircraftIcaoCode(); } + if (sApp && sApp->hasWebDataServices()) + { + const CAircraftIcaoCode designatorFromDb = sApp->getWebDataServices()->getAircraftIcaoCodeForDesignator(designator); + if (designatorFromDb.isLoadedFromDb()) { return designatorFromDb; } + } + return designator; } QString CFlightPlanComponent::getEquipmentSuffix() const