GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 13:45:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix of search for compatible filament to select. (SPE-2278)

Browse Source 
Crash was caused by filament without vendor.
This commit is contained in:
David Kocik 2024-04-25 17:21:16 +02:00 committed by Lukas Matena
parent ea3ff42278
commit da2a06c06d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/GUI_App.cpp
View File

@ -3735,7 +3735,7 @@ void GUI_App::search_and_select_filaments(const std::string& material, size_t ex
if (filament.is_compatible if (filament.is_compatible
&& !filament.preset->is_default && !filament.preset->is_default
&& filament.preset->is_visible && filament.preset->is_visible
&& !filament.preset->vendor->templates_profile && (!filament.preset->vendor || !filament.preset->vendor->templates_profile)
&& filament.preset->config.has("filament_type") && filament.preset->config.has("filament_type")
&& filament.preset->config.option("filament_type")->serialize() == material && filament.preset->config.option("filament_type")->serialize() == material
&& select_filament_preset(filament.preset, extruder_index) && select_filament_preset(filament.preset, extruder_index)
@ -3752,7 +3752,7 @@ void GUI_App::search_and_select_filaments(const std::string& material, size_t ex
for (const auto& filament : preset_bundle->extruders_filaments[extruder_index]) { for (const auto& filament : preset_bundle->extruders_filaments[extruder_index]) {
if (filament.is_compatible if (filament.is_compatible
&& !filament.preset->is_default && !filament.preset->is_default
&& !filament.preset->vendor->templates_profile && (!filament.preset->vendor || !filament.preset->vendor->templates_profile)
&& filament.preset->config.has("filament_type") && filament.preset->config.has("filament_type")
&& filament.preset->config.option("filament_type")->serialize() == material && filament.preset->config.option("filament_type")->serialize() == material
&& filament.preset->name.compare(0, 9, "Prusament") == 0 && filament.preset->name.compare(0, 9, "Prusament") == 0