fixup! Ref T681, preparations to use CG from DB

This commit is contained in:
Klaus Basan
2019-06-16 03:00:51 +02:00
parent 378e10b45b
commit 4174323439

View File

@@ -284,9 +284,9 @@ namespace BlackMisc
{
if (callsign.isEmpty()) { return CLength::null(); }
const CSimulatorSettings::CGSource source = m_settings.getCGSource();
if (source == CSimulatorSettings::CGFromDBOnly || (!dbCG.isNull() && source == CSimulatorSettings::CGFromDBFirst)) { return dbCG; }
if (source == CSimulatorSettings::CGFromDBOnly || (source == CSimulatorSettings::CGFromDBFirst && !dbCG.isNull())) { return dbCG; }
const CLength simCG = this->getSimulatorCG(callsign);
if (source == CSimulatorSettings::CGFromSimulatorOnly || (source == CSimulatorSettings::CGFromSimulatorFirst && simCG.isNull())) { return simCG; }
if (source == CSimulatorSettings::CGFromSimulatorOnly || (source == CSimulatorSettings::CGFromSimulatorFirst && !simCG.isNull())) { return simCG; }
return dbCG;
}