mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: Prefer old selection when sync AMS not compatible 

Change-Id: I6b18db51887132a997cf78d70fff9a92e23bc44a
Jira: STUDIO-5416
This commit is contained in:
chunmao.guo 2023-12-01 11:00:22 +08:00 committed by Lane.Wei
parent 3527950e14
commit 9319440d74
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libslic3r/PresetBundle.cpp
View File

@ -1767,12 +1767,20 @@ unsigned int PresetBundle::sync_ams_list(unsigned int &unknowns)
&& boost::algorithm::starts_with(f.name, filament_type); && boost::algorithm::starts_with(f.name, filament_type);
}); });
} }
if (iter == filaments.end()) if (iter == filaments.end()) {
// Prefer old selection
if (filament_presets.size() < this->filament_presets.size()) {
filament_presets.push_back(this->filament_presets[filament_presets.size()]);
filament_colors.push_back(filament_color);
++unknowns;
continue;
}
iter = std::find_if(filaments.begin(), filaments.end(), [&filament_type](auto &f) { iter = std::find_if(filaments.begin(), filaments.end(), [&filament_type](auto &f) {
return f.is_compatible && f.is_system; return f.is_compatible && f.is_system;
}); });
if (iter == filaments.end()) if (iter == filaments.end())
continue; continue;
}
++unknowns; ++unknowns;
filament_id = iter->filament_id; filament_id = iter->filament_id;
} }