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

Ref T67, allow to pass "forced"

Browse Source
This commit is contained in:
Klaus Basan
2017-05-07 04:17:40 +02:00
parent 5558cee4d8
commit 98479e8d17
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/blackgui/components/dbstashcomponent.cpp
View File

@@ -384,9 +384,9 @@ namespace BlackGui
return models; return models;
} }
CAircraftModel CDbStashComponent::consolidateWithDbData(const CAircraftModel &model) const CAircraftModel CDbStashComponent::consolidateWithDbData(const CAircraftModel &model, bool forced) const
{ {
const CAircraftModel consolidatedModel = CDatabaseUtils::consolidateModelWithDbData(model, true); const CAircraftModel consolidatedModel = CDatabaseUtils::consolidateModelWithDbData(model, forced);
return consolidatedModel; return consolidatedModel;
} }
@@ -410,11 +410,9 @@ namespace BlackGui
CAircraftModel stashModel(model); CAircraftModel stashModel(model);
const bool ownModel = stashModel.getModelType() == CAircraftModel::TypeOwnSimulatorModel; const bool ownModel = stashModel.getModelType() == CAircraftModel::TypeOwnSimulatorModel;
// merge with DB data if any // merge/update with DB data if any
if (!stashModel.hasValidDbKey()) // this is a forced update with DB data, as DB data can change
{ stashModel = this->consolidateWithDbData(stashModel, true);
stashModel = this->consolidateWithDbData(stashModel);
}
// merge with own models if any // merge with own models if any
if (!ownModel) if (!ownModel)

2
src/blackgui/components/dbstashcomponent.h
View File

@@ -197,7 +197,7 @@ namespace BlackGui
BlackMisc::Simulation::CAircraftModelList getSelectedOrAllModels() const; BlackMisc::Simulation::CAircraftModelList getSelectedOrAllModels() const;
//! Consolidate with any DB data (if available). //! Consolidate with any DB data (if available).
BlackMisc::Simulation::CAircraftModel consolidateWithDbData(const BlackMisc::Simulation::CAircraftModel &model) const; BlackMisc::Simulation::CAircraftModel consolidateWithDbData(const BlackMisc::Simulation::CAircraftModel &model, bool forced) const;
//! Consolidate with own models (if available). This updates mostly with model description, path etc. //! Consolidate with own models (if available). This updates mostly with model description, path etc.
BlackMisc::Simulation::CAircraftModel consolidateWithOwnModels(const BlackMisc::Simulation::CAircraftModel &model) const; BlackMisc::Simulation::CAircraftModel consolidateWithOwnModels(const BlackMisc::Simulation::CAircraftModel &model) const;