FIX: load from gcode stream crash with null model pointer

Change-Id: I09a17dd5726d164a4e0bc1d5f213581832a17a5d
(cherry picked from commit 52065d43c98eda7a2a7c799d2100a10b6cbc42bf)
This commit is contained in:
chunmao.guo 2023-08-09 15:03:19 +08:00 committed by lane.wei
parent c5bba1fa85
commit cf85f1c82f

View file

@ -1328,6 +1328,7 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
return false; return false;
//extract model files //extract model files
m_model = &model;
if (!_extract_from_archive(archive, m_start_part_path, [this] (mz_zip_archive& archive, const mz_zip_archive_file_stat& stat) { if (!_extract_from_archive(archive, m_start_part_path, [this] (mz_zip_archive& archive, const mz_zip_archive_file_stat& stat) {
return _extract_model_from_archive(archive, stat); return _extract_model_from_archive(archive, stat);
})) { })) {
@ -1335,7 +1336,6 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
return false; return false;
} }
m_model = &model;
if (!m_designer.empty()) { if (!m_designer.empty()) {
m_model->design_info = std::make_shared<ModelDesignInfo>(); m_model->design_info = std::make_shared<ModelDesignInfo>();
m_model->design_info->DesignerUserId = m_designer_user_id; m_model->design_info->DesignerUserId = m_designer_user_id;