FIX: [STUDIO-4235] cancel web request on bind dialog
Change-Id: I27d50814e52812f6f551eb4ee2c90cdbaaaeb3c0 Jira: STUDIO-4235
This commit is contained in:
parent
664a4a76a0
commit
c7f07b668c
|
@ -466,6 +466,7 @@ wxString get_fail_reason(int code)
|
||||||
|
|
||||||
BindMachineDialog::~BindMachineDialog()
|
BindMachineDialog::~BindMachineDialog()
|
||||||
{
|
{
|
||||||
|
web_request.Cancel();
|
||||||
m_button_bind->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(BindMachineDialog::on_bind_printer), NULL, this);
|
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);
|
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);
|
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->cancel();
|
||||||
m_bind_job->join();
|
m_bind_job->join();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (web_request.IsOk()) {
|
|
||||||
web_request.Cancel();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void BindMachineDialog::on_close(wxCloseEvent &event)
|
void BindMachineDialog::on_close(wxCloseEvent &event)
|
||||||
|
|
Loading…
Reference in New Issue