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

FIX: fix the crash issue when network plugin installing on mac 

Change-Id: I766d186fa116986ce4805e71dc5f1899f5901294
This commit is contained in:
lane.wei 2022-12-08 15:45:56 +08:00 committed by Lane.Wei
parent 6d219574a9
commit 2723ee747c
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -390,8 +390,12 @@ void GuideFrame::OnScriptMessage(wxWebViewEvent &evt)
else if (strCmd == "network_plugin_install") { else if (strCmd == "network_plugin_install") {
std::string sAction = j["data"]["action"]; std::string sAction = j["data"]["action"];
if (sAction == "yes") if (sAction == "yes") {
if (!network_plugin_ready)
InstallNetplugin = true; InstallNetplugin = true;
else //already ready
InstallNetplugin = false;
}
else else
InstallNetplugin = false; InstallNetplugin = false;
} }
@ -1088,6 +1092,7 @@ int GuideFrame::LoadProfile()
m_ProfileJson["network_plugin_install"] = wxGetApp().app_config->get("app","installed_networking"); m_ProfileJson["network_plugin_install"] = wxGetApp().app_config->get("app","installed_networking");
m_ProfileJson["network_plugin_compability"] = wxGetApp().is_compatibility_version() ? "1" : "0"; m_ProfileJson["network_plugin_compability"] = wxGetApp().is_compatibility_version() ? "1" : "0";
network_plugin_ready = wxGetApp().is_compatibility_version();
} }
catch (std::exception &e) { catch (std::exception &e) {
//wxLogMessage("GUIDE: load_profile_error %s ", e.what()); //wxLogMessage("GUIDE: load_profile_error %s ", e.what());

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

@ -112,6 +112,7 @@ private:
std::string m_Region; std::string m_Region;
bool InstallNetplugin; bool InstallNetplugin;
bool network_plugin_ready {false};
#if wxUSE_WEBVIEW_IE #if wxUSE_WEBVIEW_IE
wxMenuItem *m_script_object_el; wxMenuItem *m_script_object_el;