flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-02 23:25:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T492, alias in model lists and model

Browse Source 
Search for alias and modelstring in matching
This commit is contained in:
Klaus Basan
2019-01-05 12:18:14 +01:00
committed by Mat Sutcliffe
parent 80e925fe80
commit 58cfdd1bb9
6 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackcore/db/databaseutils.cpp
View File

@@ -186,7 +186,7 @@ namespace BlackCore
removedModelStrings.push_back(ms);
continue;
}
CAircraftModel consolidated = simulatorModels.findFirstByModelStringOrDefault(ms);
CAircraftModel consolidated = simulatorModels.findFirstByModelStringAliasOrDefault(ms);
if (consolidated.hasModelString())
{
CDatabaseUtils::consolidateModelWithDbData(consolidated, true);
@@ -237,7 +237,7 @@ namespace BlackCore
if (ms.isEmpty()) { continue; }
if (!dbModelsModelStrings.contains(ms)) { continue; }
bool modified = false;
const CAircraftModel consolidated = CDatabaseUtils::consolidateModelWithDbData(model, dbModels.findFirstByModelStringOrDefault(ms), force, &modified);
const CAircraftModel consolidated = CDatabaseUtils::consolidateModelWithDbData(model, dbModels.findFirstByModelStringAliasOrDefault(ms), force, &modified);
if (!modified) { continue; }
model = consolidated;
c++;
@@ -327,7 +327,7 @@ namespace BlackCore
if (ownModel.matchesSimulatorFlag(CSimulatorInfo::XPLANE)) { continue; }
// in DB
CAircraftModel dbModel = dbFsFamilyModels.findFirstByModelStringOrDefault(ownModel.getModelString());
CAircraftModel dbModel = dbFsFamilyModels.findFirstByModelStringAliasOrDefault(ownModel.getModelString());
if (!dbModel.isLoadedFromDb()) { continue; }
// update simulator and add