mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-20 20:03:47 +00:00
Fix PrinterWebView only clear deferred url on success (#11508)
* Fix only clear deferred url on success * add comments --------- Co-authored-by: Ioannis Giannakas <59056762+igiannakas@users.noreply.github.com> Co-authored-by: yw4z <ywsyildiz@gmail.com>
This commit is contained in:
@@ -91,7 +91,8 @@ void PrinterWebView::load_url(wxString& url, wxString apikey)
|
|||||||
m_apikey_sent = false;
|
m_apikey_sent = false;
|
||||||
|
|
||||||
if (this->IsShown()) {
|
if (this->IsShown()) {
|
||||||
m_url_deferred.clear();
|
//ORCA: m_url_deferred will be cleared on load success
|
||||||
|
//m_url_deferred.clear();
|
||||||
m_browser->LoadURL(url);
|
m_browser->LoadURL(url);
|
||||||
} else {
|
} else {
|
||||||
m_url_deferred = url;
|
m_url_deferred = url;
|
||||||
@@ -104,7 +105,8 @@ bool PrinterWebView::Show(bool show)
|
|||||||
{
|
{
|
||||||
if (show && !m_url_deferred.empty()) {
|
if (show && !m_url_deferred.empty()) {
|
||||||
m_browser->LoadURL(m_url_deferred);
|
m_browser->LoadURL(m_url_deferred);
|
||||||
m_url_deferred.clear();
|
//ORCA: m_url_deferred will be cleared on load success
|
||||||
|
//m_url_deferred.clear();
|
||||||
}
|
}
|
||||||
return wxPanel::Show(show);
|
return wxPanel::Show(show);
|
||||||
}
|
}
|
||||||
@@ -192,6 +194,8 @@ void PrinterWebView::OnLoaded(wxWebViewEvent &evt)
|
|||||||
{
|
{
|
||||||
if (evt.GetURL().IsEmpty())
|
if (evt.GetURL().IsEmpty())
|
||||||
return;
|
return;
|
||||||
|
//ORCA: url loaded successfully, safe to clear
|
||||||
|
m_url_deferred.clear();
|
||||||
SendAPIKey();
|
SendAPIKey();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user