3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-20 07:11:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

FIX: [STUDIO-3735] unload default user filament/process presets

Browse source 
Change-Id: I24e54823e91ea8f6cad9bfbdf69ee838e75f8190
(cherry picked from commit ed97c7dc65e3c44dac99b01b4dfd0951e048ffc2)
This commit is contained in:
chunmao.guo 2023-08-09 10:31:15 +08:00 • committed by lane.wei
parent 442f2472af
commit c79e84a516
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libslic3r/PresetBundle.cpp
View file

@ -916,7 +916,7 @@ void PresetBundle::remove_users_preset(AppConfig &config, std::map<std::string,
bool need_reset_print_preset = false; bool need_reset_print_preset = false;
// remove preset if user_id is not current user // remove preset if user_id is not current user
for (auto it = prints.begin(); it != prints.end();) { for (auto it = prints.begin(); it != prints.end();) {
if (it->is_user() && !it->user_id.empty() && it->user_id.compare(preset_folder_user_id) == 0 && check_removed(*it)) { if (it->is_user() && it->user_id.compare(preset_folder_user_id) == 0 && check_removed(*it)) {
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(":prints erase %1%, type %2%， user_id %3%")%it->name %Preset::get_type_string(it->type) %it->user_id; BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(":prints erase %1%, type %2%， user_id %3%")%it->name %Preset::get_type_string(it->type) %it->user_id;
if (it->name == selected_print_name) if (it->name == selected_print_name)
need_reset_print_preset = true; need_reset_print_preset = true;
@ -936,7 +936,7 @@ void PresetBundle::remove_users_preset(AppConfig &config, std::map<std::string,
std::string selected_filament_name = filaments.get_selected_preset().name; std::string selected_filament_name = filaments.get_selected_preset().name;
bool need_reset_filament_preset = false; bool need_reset_filament_preset = false;
for (auto it = filaments.begin(); it != filaments.end();) { for (auto it = filaments.begin(); it != filaments.end();) {
if (it->is_user() && !it->user_id.empty() && it->user_id.compare(preset_folder_user_id) == 0 && check_removed(*it)) { if (it->is_user() && it->user_id.compare(preset_folder_user_id) == 0 && check_removed(*it)) {
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(":filaments erase %1%, type %2%， user_id %3%")%it->name %Preset::get_type_string(it->type) %it->user_id; BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(":filaments erase %1%, type %2%， user_id %3%")%it->name %Preset::get_type_string(it->type) %it->user_id;
if (it->name == selected_filament_name) if (it->name == selected_filament_name)
need_reset_filament_preset = true; need_reset_filament_preset = true;