GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-16 23:45:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix of closing login dialog

Browse Source
This commit is contained in:
David Kocik 2024-08-19 16:42:29 +02:00 committed by Lukas Matena
parent 2bde97fb11
commit 17300d7549
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/slic3r/GUI/Plater.cpp
View File

@ -878,17 +878,17 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
user_account->on_login_code_recieved(evt.data); user_account->on_login_code_recieved(evt.data);
}); });
this->q->Bind(EVT_OPEN_PRUSAAUTH, [this](OpenPrusaAuthEvent& evt) { this->q->Bind(EVT_OPEN_PRUSAAUTH, [this](OpenPrusaAuthEvent& evt) {
if (login_dialog != nullptr) {
this->q->RemoveChild(login_dialog);
login_dialog->Destroy();
login_dialog = nullptr;
}
BOOST_LOG_TRIVIAL(info) << "open login browser: " << evt.data.first; BOOST_LOG_TRIVIAL(info) << "open login browser: " << evt.data.first;
std::string dialog_msg; std::string dialog_msg;
login_dialog = new LoginWebViewDialog(this->q, dialog_msg, evt.data.first, this->q); login_dialog = new LoginWebViewDialog(this->q, dialog_msg, evt.data.first, this->q);
if (login_dialog->ShowModal() == wxID_OK) { if (login_dialog->ShowModal() == wxID_OK) {
user_account->on_login_code_recieved(dialog_msg); user_account->on_login_code_recieved(dialog_msg);
} }
if (login_dialog != nullptr) {
this->q->RemoveChild(login_dialog);
login_dialog->Destroy();
login_dialog = nullptr;
}
}); });
this->q->Bind(EVT_OPEN_EXTERNAL_LOGIN, [this](wxCommandEvent& evt) { this->q->Bind(EVT_OPEN_EXTERNAL_LOGIN, [this](wxCommandEvent& evt) {
DownloaderUtils::Worker::perform_register(wxGetApp().app_config->get("url_downloader_dest")); DownloaderUtils::Worker::perform_register(wxGetApp().app_config->get("url_downloader_dest"));
@ -923,11 +923,8 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
this->q->Bind(EVT_UA_ID_USER_SUCCESS, [this](UserAccountSuccessEvent& evt) { this->q->Bind(EVT_UA_ID_USER_SUCCESS, [this](UserAccountSuccessEvent& evt) {
if (login_dialog != nullptr) { if (login_dialog != nullptr) {
this->q->RemoveChild(login_dialog); login_dialog->EndModal(wxID_CANCEL);
login_dialog->Destroy();
login_dialog = nullptr;
} }
// There are multiple handlers and we want to notify all // There are multiple handlers and we want to notify all
evt.Skip(); evt.Skip();
std::string who = user_account->get_username(); std::string who = user_account->get_username();