mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-02 15:15:50 +08:00
refs #745, do not consolidate with DB data when stashing editor model
(prevents that changed data are overridden by DB data again and hence reverted)
This commit is contained in:
committed by
Mathew Sutcliffe
parent
04a9381858
commit
0d70e87d11
@@ -362,12 +362,14 @@ namespace BlackGui
|
||||
|
||||
void CDbMappingComponent::ps_stashCurrentModel()
|
||||
{
|
||||
const CAircraftModel model(getEditorAircraftModel());
|
||||
CStatusMessageList msgs(this->validateCurrentModel(true));
|
||||
if (!msgs.hasErrorMessages())
|
||||
{
|
||||
const CAircraftModel editorModel(getEditorAircraftModel());
|
||||
|
||||
// do not consolidate, because we want to keep data as they are from the editor
|
||||
msgs.push_back(
|
||||
ui->comp_StashAircraft->stashModel(model, true)
|
||||
ui->comp_StashAircraft->stashModel(editorModel, true, false)
|
||||
);
|
||||
}
|
||||
if (msgs.hasErrorMessages())
|
||||
|
||||
Reference in New Issue
Block a user