diff options
author | Vojtech Kral <vojtech@kral.hk> | 2019-06-17 17:39:22 +0300 |
---|---|---|
committer | Vojtech Kral <vojtech@kral.hk> | 2019-09-17 14:20:06 +0300 |
commit | 235b659cf97211f0b80c47008d8458b9173a3a40 (patch) | |
tree | 1e799e771c9d9e653ff5f142cfe1e62487fd65d9 /src/slic3r/GUI/Preset.cpp | |
parent | dba9925c4ed37d5b44f6672824987fa9ca0ad7b8 (diff) |
WIP: ConfigWizard: 3rd party bundle installation roughly done
Diffstat (limited to 'src/slic3r/GUI/Preset.cpp')
-rw-r--r-- | src/slic3r/GUI/Preset.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/slic3r/GUI/Preset.cpp b/src/slic3r/GUI/Preset.cpp index bda096d66..be53267f9 100644 --- a/src/slic3r/GUI/Preset.cpp +++ b/src/slic3r/GUI/Preset.cpp @@ -1318,7 +1318,7 @@ bool PresetCollection::select_preset_by_name_strict(const std::string &name) } // Merge one vendor's presets with the other vendor's presets, report duplicates. -std::vector<std::string> PresetCollection::merge_presets(PresetCollection &&other, const std::set<VendorProfile> &new_vendors) +std::vector<std::string> PresetCollection::merge_presets(PresetCollection &&other, const VendorMap &new_vendors) { std::vector<std::string> duplicates; for (Preset &preset : other.m_presets) { @@ -1329,9 +1329,9 @@ std::vector<std::string> PresetCollection::merge_presets(PresetCollection &&othe if (it == m_presets.end() || it->name != preset.name) { if (preset.vendor != nullptr) { // Re-assign a pointer to the vendor structure in the new PresetBundle. - auto it = new_vendors.find(*preset.vendor); + auto it = new_vendors.find(preset.vendor->id); assert(it != new_vendors.end()); - preset.vendor = &(*it); + preset.vendor = &it->second; } this->m_presets.emplace(it, std::move(preset)); } else |