From d3ad4067dbcb5b3378cd7075ba6fae5204adf5b6 Mon Sep 17 00:00:00 2001 From: "zhou.xu" Date: Tue, 15 Apr 2025 16:29:12 +0800 Subject: [PATCH] ENH:ban gcode to send print jira: STUDIO-10518 Change-Id: I5958fe1bfea9a133d3adde6b0e64289f7ceb0f52 (cherry picked from commit 4b96f09a75ec07a756da55ace2ac7f6447c2681f) --- src/slic3r/GUI/GUI_App.cpp | 6 ++++-- src/slic3r/GUI/Plater.cpp | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index c00c8fe435..147785bbc4 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -1923,8 +1923,10 @@ bool GUI_App::is_blocking_printing(MachineObject *obj_) if (!dev) return true; std::string target_model; if (obj_ == nullptr) { - auto obj_ = dev->get_selected_machine(); - target_model = obj_->printer_type; + auto obj_ = dev->get_selected_machine(); + if (obj_) { + target_model = obj_->printer_type; + } } else { target_model = obj_->printer_type; } diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index e9972cd6d4..385ac1a08f 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -12177,7 +12177,7 @@ void Plater::load_gcode(const wxString& filename) p->view3D->get_canvas3d()->remove_raycasters_for_picking(SceneRaycaster::EType::Bed); } - p->main_frame->update_slice_print_status(MainFrame::eEventPlateUpdate, false, true);//STUDIO-11512 + p->main_frame->update_slice_print_status(MainFrame::eEventPlateUpdate, false, false); //20250416 ban gcode to send print } void Plater::reload_gcode_from_disk()