From 9fe4dbdb3d4e34e62dbd107e6483245f938bc4eb Mon Sep 17 00:00:00 2001
From: vansangpfiev <vansangpfiev@gmail.com>
Date: Tue, 20 May 2025 15:42:22 +0700
Subject: [PATCH] fix: windows installer (#5037)

---
 src-tauri/src/core/setup.rs                  | 2 +-
 src-tauri/tauri.bundle.windows.nsis.template | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src-tauri/src/core/setup.rs b/src-tauri/src/core/setup.rs
index 8c1f1d1e1..70450cc69 100644
--- a/src-tauri/src/core/setup.rs
+++ b/src-tauri/src/core/setup.rs
@@ -219,7 +219,7 @@ pub fn setup_sidecar(app: &App) -> Result<(), String> {
         "--cors",
         "ON",
         "--allowed_origins",
-        "http://localhost:3000,http://localhost:1420",
+        "http://localhost:3000,http://localhost:1420,tauri://localhost,http://tauri.localhost",
         "config",
         "--api_keys",
         app_state.inner().app_token.as_deref().unwrap_or(""),
diff --git a/src-tauri/tauri.bundle.windows.nsis.template b/src-tauri/tauri.bundle.windows.nsis.template
index b6d91790d..e1169cd8c 100644
--- a/src-tauri/tauri.bundle.windows.nsis.template
+++ b/src-tauri/tauri.bundle.windows.nsis.template
@@ -630,8 +630,11 @@ Section Install
 
   ; Copy resources
     CreateDirectory "$INSTDIR\binaries"
+    CreateDirectory "$INSTDIR\binaries\engines"
     CreateDirectory "$INSTDIR\resources"
-    SetOutPath "$INSTDIR\binaries"
+    CreateDirectory "$INSTDIR\resources\pre-install"
+    CreateDirectory "$INSTDIR\resources\themes"
+    SetOutPath "$INSTDIR\binaries\engines"
     File /nonfatal /a /r "D:\a\jan\jan\src-tauri\binaries\engines\"
     SetOutPath $INSTDIR
     ; File /a "/oname=cublas64_11.dll" "D:\a\jan\jan\src-tauri\binaries\cublas64_11.dll"
@@ -645,8 +648,9 @@ Section Install
     File /a "/oname=vcruntime140_1.dll" "D:\a\jan\jan\src-tauri\binaries\vcruntime140_1.dll"
     File /a "/oname=vcruntime140.dll" "D:\a\jan\jan\src-tauri\binaries\vcruntime140.dll"
     File /a "/oname=vulkan-1.dll" "D:\a\jan\jan\src-tauri\binaries\vulkan-1.dll"
-    SetOutPath "$INSTDIR\resources"
+    SetOutPath "$INSTDIR\resources\pre-install"
     File /nonfatal /a /r "D:\a\jan\jan\src-tauri\resources\pre-install\"
+    SetOutPath "$INSTDIR\resources\themes"
     File /nonfatal /a /r "D:\a\jan\jan\src-tauri\resources\themes\"
     SetOutPath $INSTDIR