fix

mehah · Nov 6, 2023 · 82f4f16 · 82f4f16
1 parent cb1460c
commit 82f4f16
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/src/framework/platform/unixplatform.cpp b/src/framework/platform/unixplatform.cpp
@@ -140,19 +140,27 @@ ticks_t Platform::getFileModificationTime(std::string file)
     return 0;
 }
 
-void Platform::openUrl(std::string url)
+void Platform::openUrl(std::string url, bool now)
 {
     if(url.find("http://") == std::string::npos && url.find("https://") == std::string::npos)
         url.insert(0, "http://");
 
+    const auto& action = [url] {
 #if defined(__APPLE__)
-    system(stdext::format("open %s", url).c_str());
+        system(stdext::format("open %s", url).c_str());
 #else
-    int systemRet = system(stdext::format("xdg-open %s", url).c_str());
-    if(systemRet == -1){
-        return;
-    }
+        int systemRet = system(stdext::format("xdg-open %s", url).c_str());
+        if(systemRet == -1){
+            return;
+        }
 #endif
+    };
+
+    if (now) {
+        action();
+    } else {
+        g_dispatcher.scheduleEvent(action, 50);
+    }
 }
 
 std::string Platform::getCPUName()

diff --git a/src/framework/platform/win32platform.cpp b/src/framework/platform/win32platform.cpp
@@ -155,12 +155,14 @@ void Platform::openUrl(std::string url, bool now)
     if (url.find("http://") == std::string::npos && url.find("https://") == std::string::npos)
         url.insert(0, "http://");
 
-    if (now) {
+    const auto& action = [url] {
         ShellExecuteW(nullptr, L"open", stdext::utf8_to_utf16(url).data(), nullptr, nullptr, SW_SHOWNORMAL);
+    };
+
+    if (now) {
+        action();
     } else {
-        g_dispatcher.scheduleEvent([url] {
-            ShellExecuteW(NULL, L"open", stdext::utf8_to_utf16(url).c_str(), NULL, NULL, SW_SHOWNORMAL);
-        }, 50);
+        g_dispatcher.scheduleEvent(action, 50);
     }
 }