From 82b9b5dc80c737073439abf51f6a59d46e4c28cd Mon Sep 17 00:00:00 2001 From: "zhimin.zeng" Date: Mon, 25 Aug 2025 15:53:42 +0800 Subject: [PATCH] FIX: crash when cali with ext slot for single extruder printer jira: STUDIO-14212 Change-Id: I4e7a7a7617c6f6fba216f5cd72857a89069461d0 (cherry picked from commit 9633d47fcd7d0dade73725ad9d45f16d8f9c7f9c) --- src/slic3r/GUI/CalibrationWizard.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/slic3r/GUI/CalibrationWizard.cpp b/src/slic3r/GUI/CalibrationWizard.cpp index bf905bc13a..2dd1f15934 100644 --- a/src/slic3r/GUI/CalibrationWizard.cpp +++ b/src/slic3r/GUI/CalibrationWizard.cpp @@ -775,7 +775,7 @@ void PressureAdvanceWizard::on_cali_start() calib_info.filament_prest = temp_filament_preset; std::map filament_list = preset_page->get_filament_ams_list(); - calib_info.filament_color = filament_list[selected_tray_id].opt_string("filament_colour", 0u); + calib_info.filament_color = filament_list[selected_filaments.begin()->first].opt_string("filament_colour", 0u); wxArrayString values = preset_page->get_custom_range_values(); if (values.size() != 3) { @@ -860,7 +860,7 @@ void PressureAdvanceWizard::on_cali_start() calib_info.print_prest = preset_page->get_print_preset(); calib_info.filament_prest = temp_filament_preset; std::map filament_list = preset_page->get_filament_ams_list(); - calib_info.filament_color = filament_list[selected_tray_id].opt_string("filament_colour", 0u); + calib_info.filament_color = filament_list[item.first].opt_string("filament_colour", 0u); calib_info.params.mode = CalibMode::Calib_Auto_PA_Line; calib_infos.emplace_back(calib_info); } @@ -1325,7 +1325,7 @@ void FlowRateWizard::on_cali_start(CaliPresetStage stage, float cali_value, Flow calib_info.filament_prest = temp_filament_preset; std::map filament_list = preset_page->get_filament_ams_list(); - calib_info.filament_color = filament_list[selected_tray_id].opt_string("filament_colour", 0u); + calib_info.filament_color = filament_list[selected_filaments.begin()->first].opt_string("filament_colour", 0u); if (cali_stage > 0) { if (!CalibUtils::calib_flowrate(cali_stage, calib_info, wx_err_string)) { @@ -1707,7 +1707,7 @@ void MaxVolumetricSpeedWizard::on_cali_start() calib_info.nozzle_volume_type = preset_page->get_nozzle_volume_type(calib_info.extruder_id); calib_info.filament_prest = selected_filaments.begin()->second; std::map filament_list = preset_page->get_filament_ams_list(); - calib_info.filament_color = filament_list[selected_tray_id].opt_string("filament_colour", 0u); + calib_info.filament_color = filament_list[selected_filaments.begin()->first].opt_string("filament_colour", 0u); } calib_info.bed_type = plate_type;