juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 02:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: CLI: fix the crash issue caused filament_id missing

Browse Source 
jira: no-jira
Change-Id: I6256a846cf30f304deda32f61ed5329aacdb5f73
(cherry picked from commit d14e3f42a0a16951651a47d49e05e509ee4696c0)
This commit is contained in:
lane.wei
2025-02-14 23:03:20 +08:00
committed by Noisyfox
parent 71e5afc029
commit 22000cc7a4
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/OrcaSlicer.cpp
View File

@@ -2907,13 +2907,6 @@ int CLI::run(int argc, char **argv)
opt_filament_settings->set_at(filament_name_setting, filament_index-1, 0);
config.erase("filament_settings_id");
std::string& filament_id = load_filaments_id[index];
ConfigOptionStrings *opt_filament_ids = static_cast<ConfigOptionStrings *> (m_print_config.option("filament_ids", true));
ConfigOptionString* filament_id_setting = new ConfigOptionString(filament_id);
if (opt_filament_ids->size() < filament_count)
opt_filament_ids->resize(filament_count, filament_id_setting);
opt_filament_ids->set_at(filament_id_setting, filament_index-1, 0);
//todo: update different settings of filaments
different_settings[filament_index] = "";
inherits_group[filament_index] = load_filaments_inherit[index];
@@ -2927,6 +2920,14 @@ int CLI::run(int argc, char **argv)
}
}
//add filament_id
std::string& filament_id = load_filaments_id[index];
ConfigOptionStrings *opt_filament_ids = static_cast<ConfigOptionStrings *> (m_print_config.option("filament_ids", true));
ConfigOptionString* filament_id_setting = new ConfigOptionString(filament_id);
if (opt_filament_ids->size() < filament_count)
opt_filament_ids->resize(filament_count, filament_id_setting);
opt_filament_ids->set_at(filament_id_setting, filament_index-1, 0);
//parse the filament value to index th
//loop through options and apply them
std::set<std::string> different_keys_set(different_keys.begin(), different_keys.end());