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

FIX:protect null pointer for "MaterialItem *item" 

jira: none
Change-Id: Idc07a461d06f0dfd4ce44833b4c73231f8aafa5e
This commit is contained in:
zhou.xu 2025-01-02 19:59:48 +08:00 committed by lane.wei
parent 9e29cd3d21
commit 6631afc05a
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/slic3r/GUI/SyncAmsInfoDialog.cpp
View File

@ -97,6 +97,8 @@ bool SyncAmsInfoDialog::Show(bool show)
m_tip_text->Hide();
m_specify_color_cluster_title->Hide();
m_are_you_sure_title->Hide();
m_append_color_checkbox->Hide();
m_merge_color_checkbox->Hide();
}
if (!m_input_info.connected_printer) {
m_button_cancel->Hide();
@ -1612,8 +1614,18 @@ bool SyncAmsInfoDialog::is_nozzle_type_match(ExtderData data)
std::map<int, std::string> used_extruders_flow;
std::vector<int> used_extruders; // 0 based
for (auto f : used_filaments) {
if (f <= 0) {
BOOST_LOG_TRIVIAL(error) << "check error:f < 0";
continue;
}
int filament_extruder = filament_maps[f - 1] - 1;
if (std::find(used_extruders.begin(), used_extruders.end(), filament_extruder) == used_extruders.end()) used_extruders.emplace_back(filament_extruder);
if (std::find(used_extruders.begin(), used_extruders.end(), filament_extruder) == used_extruders.end()) {
if (filament_extruder < 0) {
BOOST_LOG_TRIVIAL(error) << "check error:filament_extruder < 0";
continue;
}
used_extruders.emplace_back(filament_extruder);
}
}
std::sort(used_extruders.begin(), used_extruders.end());
@ -3619,6 +3631,10 @@ void SyncAmsInfoDialog::reset_and_sync_ams_list()
item = new MaterialItem(m_filament_panel, colour_rgb, _L(display_materials[extruder])); // m_filament_right_panel
m_sizer_ams_mapping->Add(item, 0, wxALL, FromDIP(5)); // m_sizer_ams_mapping_right
}
else {
BOOST_LOG_TRIVIAL(error) << "check error:MaterialItem *item = nullptr";
continue;
}
} else {
item = new MaterialItem(m_filament_panel, colour_rgb, _L(display_materials[extruder]));
m_sizer_ams_mapping->Add(item, 0, wxALL, FromDIP(5));