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

refs #755, restore distributor order when consolidating with DB data

Browse Source 
(formerly order was overridden)
This commit is contained in:
Klaus Basan
2016-09-03 01:08:51 +02:00
committed by Roland Winklmeier
parent 1e8090d366
commit cbc095d230
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,12 +30,14 @@ namespace BlackCore
if (modified) { *modified = false; }
if (!model.hasModelString()) { return model; }
if (!force && model.hasValidDbKey()) { return model; }
const int distributorOrder = model.getDistributorOrder(); // later restore that order
CAircraftModel dbModel(sApp->getWebDataServices()->getModelForModelString(model.getModelString()));
if (dbModel.hasValidDbKey())
{
if (modified) { *modified = true; }
dbModel.updateByLocalFileNames(model);
dbModel.setDistributorOrder(distributorOrder);
return dbModel;
}
@@ -69,6 +71,7 @@ namespace BlackCore
consolidatedModel.setDistributor(dbDistributor);
}
consolidatedModel.updateByLocalFileNames(model);
consolidatedModel.setDistributorOrder(distributorOrder);
return consolidatedModel;
}