mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: crash when sending print with empty ams_id 

jira: none
Change-Id: I89dc87af28b45c69eac86810444de2519dfccd08
This commit is contained in:
zhimin.zeng 2024-10-14 20:20:15 +08:00 committed by lane.wei
parent a0b563dc8f
commit f53e00ec6d
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/slic3r/GUI/SelectMachine.cpp
View File

@ -2121,8 +2121,14 @@ bool SelectMachineDialog::get_ams_mapping_result(std::string &mapping_array_str,
try try
{ {
mapping_item_v1["ams_id"] = std::stoi(m_ams_mapping_result[k].ams_id); if (m_ams_mapping_result[k].ams_id.empty() || m_ams_mapping_result[k].slot_id.empty()) { // invalid case
mapping_item_v1["slot_id"] = std::stoi(m_ams_mapping_result[k].slot_id); mapping_item_v1["ams_id"] = VIRTUAL_TRAY_MAIN_ID;
mapping_item_v1["slot_id"] = VIRTUAL_TRAY_MAIN_ID;
}
else {
mapping_item_v1["ams_id"] = std::stoi(m_ams_mapping_result[k].ams_id);
mapping_item_v1["slot_id"] = std::stoi(m_ams_mapping_result[k].slot_id);
}
} }
catch (...) catch (...)
{ {
@ -3936,6 +3942,9 @@ void SelectMachineDialog::update_show_status()
}; };
std::vector<ExtruderStatus> extruder_status(nozzle_nums); std::vector<ExtruderStatus> extruder_status(nozzle_nums);
for (const FilamentInfo &item : m_ams_mapping_result) { for (const FilamentInfo &item : m_ams_mapping_result) {
if (item.ams_id.empty())
continue;
int extruder_id = obj_->get_extruder_id_by_ams_id(item.ams_id); int extruder_id = obj_->get_extruder_id_by_ams_id(item.ams_id);
if (DeviceManager::is_virtual_slot(stoi(item.ams_id))) if (DeviceManager::is_virtual_slot(stoi(item.ams_id)))
extruder_status[extruder_id].has_vt_slot = true; extruder_status[extruder_id].has_vt_slot = true;