From 6588ff440b4313dee6ff52ba31e3b01a0f5ca7ce Mon Sep 17 00:00:00 2001 From: Stone Li Date: Sat, 14 Sep 2024 16:01:04 +0800 Subject: [PATCH] FIX: fix crash in ams mapping JIRA: STUDIO-8195 Change-Id: I8d2bed7b6b2789879d802a95566c47d5006e4069 Signed-off-by: Stone Li --- src/slic3r/GUI/SelectMachine.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 238fd504f..fa7ab1634 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -1916,9 +1916,11 @@ bool SelectMachineDialog::get_ams_mapping_result(std::string &mapping_array_str, tray_id = m_ams_mapping_result[k].tray_id; mapping_item["ams"] = tray_id; mapping_item["filamentType"] = m_filaments[k].type; - auto it = wxGetApp().preset_bundle->filaments.find_preset(wxGetApp().preset_bundle->filament_presets[i]); - if (it != nullptr) { - mapping_item["filamentId"] = it->filament_id; + if (i >= 0 && i < wxGetApp().preset_bundle->filament_presets.size()) { + auto it = wxGetApp().preset_bundle->filaments.find_preset(wxGetApp().preset_bundle->filament_presets[i]); + if (it != nullptr) { + mapping_item["filamentId"] = it->filament_id; + } } //convert #RRGGBB to RRGGBBAA mapping_item["sourceColor"] = m_filaments[k].color;