From c7f07b668c0dab33ebb179432ad16334771305dc Mon Sep 17 00:00:00 2001 From: "chunmao.guo" Date: Mon, 28 Aug 2023 11:08:46 +0800 Subject: [PATCH] FIX: [STUDIO-4235] cancel web request on bind dialog Change-Id: I27d50814e52812f6f551eb4ee2c90cdbaaaeb3c0 Jira: STUDIO-4235 --- src/slic3r/GUI/BindDialog.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/slic3r/GUI/BindDialog.cpp b/src/slic3r/GUI/BindDialog.cpp index ecaa84569..3a028b1ca 100644 --- a/src/slic3r/GUI/BindDialog.cpp +++ b/src/slic3r/GUI/BindDialog.cpp @@ -466,6 +466,7 @@ wxString get_fail_reason(int code) BindMachineDialog::~BindMachineDialog() { + web_request.Cancel(); m_button_bind->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(BindMachineDialog::on_bind_printer), NULL, this); m_button_cancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(BindMachineDialog::on_cancel), NULL, this); this->Disconnect(EVT_BIND_MACHINE_FAIL, wxCommandEventHandler(BindMachineDialog::on_bind_fail), NULL, this); @@ -536,10 +537,6 @@ wxString get_fail_reason(int code) m_bind_job->cancel(); m_bind_job->join(); } - - if (web_request.IsOk()) { - web_request.Cancel(); - } } void BindMachineDialog::on_close(wxCloseEvent &event)