mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-27 11:05:44 +08:00
fixup! Ref T681, preparations to use CG from DB
This commit is contained in:
@@ -284,9 +284,9 @@ namespace BlackMisc
|
|||||||
{
|
{
|
||||||
if (callsign.isEmpty()) { return CLength::null(); }
|
if (callsign.isEmpty()) { return CLength::null(); }
|
||||||
const CSimulatorSettings::CGSource source = m_settings.getCGSource();
|
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);
|
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;
|
return dbCG;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user