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

refs #768, misc adjustments

Browse Source 
* changed signature of ownAircraftModelChanged to model
* added function for a reverse lookup of a model (string->model) and use it when model changed
* renamed function to updateByLocalFileNames
This commit is contained in:
Klaus Basan
2016-10-06 21:24:54 +02:00
committed by Mathew Sutcliffe
parent 501bea0960
commit bf8198e2c2
10 changed files with 112 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,10 +33,11 @@ namespace BlackCore
const int distributorOrder = model.getDistributorOrder(); // later restore that order
CAircraftModel dbModel(sApp->getWebDataServices()->getModelForModelString(model.getModelString()));
if (dbModel.hasValidDbKey())
if (dbModel.isLoadedFromDb())
{
// take the db model as original
if (modified) { *modified = true; }
dbModel.updateByLocalFileNames(model);
dbModel.updateMissingParts(model);
dbModel.setDistributorOrder(distributorOrder);
return dbModel;
}
@@ -70,7 +71,7 @@ namespace BlackCore
if (modified) { *modified = true; }
consolidatedModel.setDistributor(dbDistributor);
}
consolidatedModel.updateByLocalFileNames(model);
consolidatedModel.updateLocalFileNames(model);
consolidatedModel.setDistributorOrder(distributorOrder);
return consolidatedModel;
}