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

FIX: [STUDIO-3532] cancel web request on unbind dialog 

Change-Id: I4830dcc32de4daec47066539bb8eaa12a51adfbd
This commit is contained in:
chunmao.guo 2023-07-04 18:02:25 +08:00 committed by Lane.Wei
parent 1d8489cfb4
commit ea97a9aa33
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/slic3r/GUI/BindDialog.cpp
View File

@ -804,6 +804,7 @@ UnBindMachineDialog::UnBindMachineDialog(Plater *plater /*= nullptr*/)
UnBindMachineDialog::~UnBindMachineDialog() UnBindMachineDialog::~UnBindMachineDialog()
{ {
web_request.Cancel();
m_button_unbind->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(UnBindMachineDialog::on_unbind_printer), NULL, this); m_button_unbind->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(UnBindMachineDialog::on_unbind_printer), NULL, this);
m_button_cancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(UnBindMachineDialog::on_cancel), NULL, this); m_button_cancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(UnBindMachineDialog::on_cancel), NULL, this);
} }
@ -873,11 +874,11 @@ void UnBindMachineDialog::on_show(wxShowEvent &event)
wxString username_text = from_u8(wxGetApp().getAgent()->get_user_name()); wxString username_text = from_u8(wxGetApp().getAgent()->get_user_name());
m_user_name->SetLabelText(username_text); m_user_name->SetLabelText(username_text);
wxString avatar_url = wxGetApp().getAgent()->get_user_avatar(); wxString avatar_url = wxGetApp().getAgent()->get_user_avatar();
wxWebRequest request = wxWebSession::GetDefault().CreateRequest(this, avatar_url); web_request = wxWebSession::GetDefault().CreateRequest(this, avatar_url);
if (!request.IsOk()) { if (!web_request.IsOk()) {
// todo request fail // todo request fail
} }
request.Start(); web_request.Start();
} }
Layout(); Layout();

1
src/slic3r/GUI/BindDialog.hpp
View File

@ -108,6 +108,7 @@ protected:
MachineObject *m_machine_info{nullptr}; MachineObject *m_machine_info{nullptr};
wxStaticBitmap *m_avatar; wxStaticBitmap *m_avatar;
wxStaticBitmap *m_printer_img; wxStaticBitmap *m_printer_img;
wxWebRequest web_request;
public: public:
UnBindMachineDialog(Plater *plater = nullptr); UnBindMachineDialog(Plater *plater = nullptr);