From aa55e033540cc77c3fb159b9230337d9dd33034e Mon Sep 17 00:00:00 2001
From: Jason Tsai <jason@pews.dev>
Date: Tue, 28 May 2024 22:34:36 +0800
Subject: [PATCH] fix: set window origin default to null (#9899)

---
 .changes/tauri-window-origin-default-to-null.md | 5 +++++
 core/tauri/src/manager/webview.rs               | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 .changes/tauri-window-origin-default-to-null.md

diff --git a/.changes/tauri-window-origin-default-to-null.md b/.changes/tauri-window-origin-default-to-null.md
new file mode 100644
index 000000000..748932cd7
--- /dev/null
+++ 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
index deb295831..c7b2e100c 100644
--- 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()) {