From b7cfcb6effed6e2ef701ce3d15534fed45a6865a Mon Sep 17 00:00:00 2001 From: anjis Date: Fri, 5 Jun 2026 21:15:52 +0800 Subject: [PATCH] Fix connection issues with CC2 on Linux (#14024) --- .../elegoolink/web/lan_service_web/index.html | 283 ------------------ .../elegoolink}/lan_service_web/favicon.ico | Bin .../web/elegoolink/lan_service_web/index.html | 265 ++++++++++++++++ src/slic3r/GUI/PrinterWebView.cpp | 4 +- src/slic3r/Utils/ElegooLink.cpp | 2 +- 5 files changed, 267 insertions(+), 287 deletions(-) delete mode 100644 resources/plugins/elegoolink/web/lan_service_web/index.html rename resources/{plugins/elegoolink/web => web/elegoolink}/lan_service_web/favicon.ico (100%) create mode 100644 resources/web/elegoolink/lan_service_web/index.html diff --git a/resources/plugins/elegoolink/web/lan_service_web/index.html b/resources/plugins/elegoolink/web/lan_service_web/index.html deleted file mode 100644 index b3b8242ddf..0000000000 --- a/resources/plugins/elegoolink/web/lan_service_web/index.html +++ /dev/null @@ -1,283 +0,0 @@ -ELEGOO-Create The Future
\ No newline at end of file diff --git a/resources/plugins/elegoolink/web/lan_service_web/favicon.ico b/resources/web/elegoolink/lan_service_web/favicon.ico similarity index 100% rename from resources/plugins/elegoolink/web/lan_service_web/favicon.ico rename to resources/web/elegoolink/lan_service_web/favicon.ico diff --git a/resources/web/elegoolink/lan_service_web/index.html b/resources/web/elegoolink/lan_service_web/index.html new file mode 100644 index 0000000000..5bf47ca9b0 --- /dev/null +++ b/resources/web/elegoolink/lan_service_web/index.html @@ -0,0 +1,265 @@ +ELEGOO-Create The Future
\ No newline at end of file diff --git a/src/slic3r/GUI/PrinterWebView.cpp b/src/slic3r/GUI/PrinterWebView.cpp index 201f1b09e9..0d6c0bcedf 100644 --- a/src/slic3r/GUI/PrinterWebView.cpp +++ b/src/slic3r/GUI/PrinterWebView.cpp @@ -243,12 +243,10 @@ void PrinterWebView::SendAPIKey() m_apikey); m_browser->RemoveAllUserScripts(); -#ifdef _WIN32 - // RemoveAllUserScripts causes WebView2 to forget about our script message handler, + // RemoveAllUserScripts causes WebView to forget about our script message handler, // so re-add it here. m_browser->RemoveScriptMessageHandler("wx"); m_browser->AddScriptMessageHandler("wx"); -#endif #ifdef __linux__ // Re-inject the vue-resize/WebKitGTK workaround that RemoveAllUserScripts just cleared. diff --git a/src/slic3r/Utils/ElegooLink.cpp b/src/slic3r/Utils/ElegooLink.cpp index cf80d29dc8..6a72d48373 100644 --- a/src/slic3r/Utils/ElegooLink.cpp +++ b/src/slic3r/Utils/ElegooLink.cpp @@ -405,7 +405,7 @@ namespace Slic3r { if (classify_printer_model(config->opt_string("printer_model")) != ElegooPrinterType::CC2) return fallback_webui; - std::string web_path = resources_dir() + "/plugins/elegoolink/web/lan_service_web/index.html"; + std::string web_path = resources_dir() + "/web/elegoolink/lan_service_web/index.html"; std::replace(web_path.begin(), web_path.end(), '\\', '/'); web_path = "file://" + web_path;