GitHub-Proxy/BambuStudio
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git synced 2025-08-19 06:45:57 +08:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

FIX: Prefer old selection when sync AMS not compatible

Browse Source 
Change-Id: I6b18db51887132a997cf78d70fff9a92e23bc44a
Jira: STUDIO-5416
(cherry picked from commit 077fae29823cf4f3071d408b1b40f55ee0cb33c6)
This commit is contained in:
chunmao.guo 2023-12-01 11:00:22 +08:00 committed by lane.wei
parent 8be410aa7d
commit 27b8eb680b
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

@ -1766,12 +1766,20 @@ unsigned int PresetBundle::sync_ams_list(unsigned int &unknowns)
&& 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) {
return f.is_compatible && f.is_system;
});
if (iter == filaments.end())
continue;
if (iter == filaments.end())
continue;
}
++unknowns;
filament_id = iter->filament_id;
}