rebase orca2.2.0

Snapmaker · Dec 9, 2024 · 229a976 · 229a976
1 parent cd9f3dd
commit 229a976
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/src/slic3r/GUI/Downloader.cpp b/src/slic3r/GUI/Downloader.cpp
@@ -144,7 +144,7 @@ void Downloader::start_download(const std::string& full_url)
 
     // Orca: Replace PS workaround for "mysterious slash" with a more dynamic approach
     // Windows seems to have fixed the issue and this provides backwards compatability for those it still affects
-	boost::regex re(R"(^(orcaslicer|prusaslicer|bambustudio|cura):\/\/open[\/]?\?file=)", boost::regbase::icase);
+	boost::regex re(R"(^(Snapmaker_Orca|prusaslicer|bambustudio|cura):\/\/open[\/]?\?file=)", boost::regbase::icase);
 	boost::regex re2(R"(^(bambustudioopen):\/\/)", boost::regex::icase);
     boost::smatch results;
 

diff --git a/src/slic3r/GUI/InstanceCheck.cpp b/src/slic3r/GUI/InstanceCheck.cpp
@@ -501,7 +501,7 @@ void OtherInstanceMessageHandler::handle_message(const std::string& message)
 
 	std::vector<boost::filesystem::path> paths;
 	std::vector<std::string> downloads;
-	boost::regex re(R"(^(orcaslicer|prusaslicer|cura|bambustudio):\/\/open[\/]?\?file=)", boost::regbase::icase);
+	boost::regex re(R"(^(Snapmaker_Orca|prusaslicer|cura|bambustudio):\/\/open[\/]?\?file=)", boost::regbase::icase);
 	boost::regex re2(R"(^(bambustudioopen):\/\/)", boost::regex::icase);
 	boost::smatch results;
 

diff --git a/src/slic3r/GUI/WebSMUserLoginDialog.cpp b/src/slic3r/GUI/WebSMUserLoginDialog.cpp
@@ -194,9 +194,6 @@ void SMUserLogin::OnNavigationRequest(wxWebViewEvent &evt)
                                     wxGetApp().sm_get_userinfo()->set_user_icon_url(data["icon"].get<std::string>());
                                 }
                             }
-
-                            wxLaunchDefaultBrowser(m_home_url);
-                            this->Hide();
                         });
                     }
                 })
@@ -207,11 +204,6 @@ void SMUserLogin::OnNavigationRequest(wxWebViewEvent &evt)
         });
         this->RunScript("document.cookie = '';");
         // load_url(m_home_url);
-    } else {
-        if (tmpUrl.find("/logout") != std::string::npos) {
-            this->Hide();
-            wxLaunchDefaultBrowser(m_home_url);
-        }
     }
     UpdateState();
 }