fix: set window origin default to null (#9899)

tauri-apps · May 28, 2024 · aa55e03 · aa55e03
1 parent 3f1c59d
commit aa55e03
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.changes/tauri-window-origin-default-to-null.md b/.changes/tauri-window-origin-default-to-null.md
@@ -0,0 +1,5 @@
+---
+'tauri': 'patch:bug'
+---
+
+Set default window origin to `null`. Prevent window crash when loading `about:blank`.
diff --git a/core/tauri/src/manager/webview.rs b/core/tauri/src/manager/webview.rs
@@ -253,16 +253,18 @@ impl<R: Runtime> WebviewManager<R> {
       && window_url.scheme() != "https"
     {
       format!("http://{}.localhost", window_url.scheme())
-    } else {
+    } else if let Some(host) = window_url.host() {
       format!(
         "{}://{}{}",
         window_url.scheme(),
-        window_url.host().unwrap(),
+        host,
         window_url
           .port()
           .map(|p| format!(":{p}"))
           .unwrap_or_default()
       )
+    } else {
+      "null".into()
     };
 
     if !registered_scheme_protocols.contains(&"tauri".into()) {