mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-08 07:27:41 -06:00
Fixed an issue that in some cases, the OrcaSlicer_profile_validator didn't report errors properly
This commit is contained in:
parent
db2f50b844
commit
bfb4a897f6
1 changed files with 2 additions and 0 deletions
|
@ -130,6 +130,7 @@ PresetBundle& PresetBundle::operator=(const PresetBundle &rhs)
|
||||||
project_config = rhs.project_config;
|
project_config = rhs.project_config;
|
||||||
vendors = rhs.vendors;
|
vendors = rhs.vendors;
|
||||||
obsolete_presets = rhs.obsolete_presets;
|
obsolete_presets = rhs.obsolete_presets;
|
||||||
|
m_errors = rhs.m_errors;
|
||||||
|
|
||||||
// Adjust Preset::vendor pointers to point to the copied vendors map.
|
// Adjust Preset::vendor pointers to point to the copied vendors map.
|
||||||
prints .update_vendor_ptrs_after_copy(this->vendors);
|
prints .update_vendor_ptrs_after_copy(this->vendors);
|
||||||
|
@ -1405,6 +1406,7 @@ std::vector<std::string> PresetBundle::merge_presets(PresetBundle &&other)
|
||||||
append(duplicate_prints, std::move(duplicate_filaments));
|
append(duplicate_prints, std::move(duplicate_filaments));
|
||||||
append(duplicate_prints, std::move(duplicate_sla_materials));
|
append(duplicate_prints, std::move(duplicate_sla_materials));
|
||||||
append(duplicate_prints, std::move(duplicate_printers));
|
append(duplicate_prints, std::move(duplicate_printers));
|
||||||
|
m_errors += other.m_errors;
|
||||||
return duplicate_prints;
|
return duplicate_prints;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue