From fcd0a114908e84dd6eef9df2ff8e2d3cd1e09624 Mon Sep 17 00:00:00 2001 From: "haolin.tian" Date: Tue, 5 Aug 2025 20:48:25 +0800 Subject: [PATCH] FIX: Remove redundant calls to set_selected_machine when disconnecting LAN jira: [STUDIO-13828] Change-Id: Icb2cca28cddec1e4e6b6b14b6893777db1f1a3a8 (cherry picked from commit 477fd8d3cf3adad8daaa00d95244225d9ac800b3) --- src/slic3r/GUI/ConnectPrinter.cpp | 5 +---- src/slic3r/GUI/ConnectPrinter.hpp | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/slic3r/GUI/ConnectPrinter.cpp b/src/slic3r/GUI/ConnectPrinter.cpp index b6ad6b5042..252899a4d9 100644 --- a/src/slic3r/GUI/ConnectPrinter.cpp +++ b/src/slic3r/GUI/ConnectPrinter.cpp @@ -171,7 +171,7 @@ void ConnectPrinterDialog::on_input_enter(wxCommandEvent& evt) } -void ConnectPrinterDialog::on_button_confirm(wxCommandEvent &event) +void ConnectPrinterDialog::on_button_confirm(wxCommandEvent &event) { wxString code = m_textCtrl_code->GetTextCtrl()->GetValue(); for (char c : code) { @@ -182,9 +182,6 @@ void ConnectPrinterDialog::on_button_confirm(wxCommandEvent &event) } if (m_obj) { m_obj->set_user_access_code(code.ToStdString()); - if (m_need_connect) { - wxGetApp().getDeviceManager()->set_selected_machine(m_obj->get_dev_id()); - } } EndModal(wxID_OK); } diff --git a/src/slic3r/GUI/ConnectPrinter.hpp b/src/slic3r/GUI/ConnectPrinter.hpp index db45bd1180..95175a1ab0 100644 --- a/src/slic3r/GUI/ConnectPrinter.hpp +++ b/src/slic3r/GUI/ConnectPrinter.hpp @@ -25,7 +25,6 @@ class ConnectPrinterDialog : public DPIDialog { private: protected: - bool m_need_connect{true}; wxStaticText * m_staticText_connection_code; TextInput * m_textCtrl_code; Button * m_button_confirm; @@ -46,12 +45,11 @@ public: ~ConnectPrinterDialog(); - void go_connect_printer(bool need) {m_need_connect = need;}; void end_modal(wxStandardID id); void init_bitmap(); void set_machine_object(MachineObject* obj); void on_input_enter(wxCommandEvent& evt); - void on_button_confirm(wxCommandEvent &event); + void on_button_confirm(wxCommandEvent &event); void on_dpi_changed(const wxRect &suggested_rect) override; }; }} // namespace Slic3r::GUI