juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 11:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: potential cli crash caused by missing params

Browse Source 
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I1b61e44414118e40e421592649928664fdecf092
(cherry picked from commit 6deb3db25b7a7e4bc7a71d75f661b3f4b996d73f)
This commit is contained in:
xun.zhang
2025-07-07 12:24:03 +08:00
committed by Noisyfox
parent 9982eaa036
commit 54f758055c
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/OrcaSlicer.cpp
View File

@@ -3168,17 +3168,31 @@ int CLI::run(int argc, char **argv)
std::vector<int> nozzle_flush_dataset(new_extruder_count, 0); std::vector<int> nozzle_flush_dataset(new_extruder_count, 0);
{ {
std::vector<int>& nozzle_flush_dataset_full = m_print_config.option<ConfigOptionIntsNullable>("nozzle_flush_dataset",true)->values; std::vector<int> nozzle_flush_dataset_full = m_print_config.option<ConfigOptionIntsNullable>("nozzle_flush_dataset",true)->values;
if (m_print_config.has("printer_extruder_variant")) { if (m_print_config.has("printer_extruder_variant"))
nozzle_flush_dataset_full.resize(m_print_config.option<ConfigOptionStrings>("printer_extruder_variant")->size(), 0); nozzle_flush_dataset_full.resize(m_print_config.option<ConfigOptionStrings>("printer_extruder_variant")->size(), 0);
} else
auto extruders = m_print_config.option<ConfigOptionEnumsGeneric>("extruder_type")->values; nozzle_flush_dataset_full.resize(1, 0);
auto volume_types = m_print_config.option<ConfigOptionEnumsGeneric>("nozzle_volume_type")->values; // get volume type from 3mf
std::vector<int> extruders;
if (m_print_config.has("extruder_type"))
extruders = m_print_config.option<ConfigOptionEnumsGeneric>("extruder_type")->values;
else
extruders.resize(1,int(ExtruderType::etDirectDrive));
std::vector<int> volume_types;
if (m_print_config.has("nozzle_volume_type"))
volume_types = m_print_config.option<ConfigOptionEnumsGeneric>("nozzle_volume_type")->values; // get volume type from 3mf
else
volume_types.resize(1, int(NozzleVolumeType::nvtStandard));
if(m_extra_config.has("nozzle_volume_type")) // get volume type from input if(m_extra_config.has("nozzle_volume_type")) // get volume type from input
volume_types = m_extra_config.option<ConfigOptionEnumsGeneric>("nozzle_volume_type")->values; volume_types = m_extra_config.option<ConfigOptionEnumsGeneric>("nozzle_volume_type")->values;
for (int eidx = 0; eidx < new_extruder_count; ++eidx) { for (int eidx = 0; eidx < new_extruder_count; ++eidx) {
int index = m_print_config.get_index_for_extruder(eidx + 1, "printer_extruder_id", ExtruderType(extruders[eidx]), NozzleVolumeType(volume_types[eidx]), "printer_extruder_variant"); int index = 0;
if (m_print_config.has("printer_extruder_id") && m_print_config.has("printer_extruder_variant"))
index = m_print_config.get_index_for_extruder(eidx + 1, "printer_extruder_id", ExtruderType(extruders[eidx]), NozzleVolumeType(volume_types[eidx]), "printer_extruder_variant");
nozzle_flush_dataset[eidx] = nozzle_flush_dataset_full[index]; nozzle_flush_dataset[eidx] = nozzle_flush_dataset_full[index];
} }
} }