From 72748cc45cf670dd03c86c8deceb5942598f5ad9 Mon Sep 17 00:00:00 2001
From: Felix Eckhardt <eckhardt@rocket-solutions.de>
Date: Fri, 17 Jan 2025 21:25:15 +0100
Subject: [PATCH] fix(windows): Resolve broken installation directory handling
 in MSI & NSIS, preventing duplicate installations during updates (#12365)

---
 .changes/fix-bundler-msi-install-dir-lookup.md       | 5 +++++
 crates/tauri-bundler/src/bundle/windows/msi/main.wxs | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 .changes/fix-bundler-msi-install-dir-lookup.md

diff --git a/.changes/fix-bundler-msi-install-dir-lookup.md b/.changes/fix-bundler-msi-install-dir-lookup.md
new file mode 100644
index 000000000000..b54662c80b29
--- /dev/null
+++ b/.changes/fix-bundler-msi-install-dir-lookup.md
@@ -0,0 +1,5 @@
+---
+tauri-bundler: 'patch:bug'
+---
+
+Fixed an issue that caused the `.msi` installer not to lookup the `INSTALLDIR` set in the `nsis` installer.
diff --git a/crates/tauri-bundler/src/bundle/windows/msi/main.wxs b/crates/tauri-bundler/src/bundle/windows/msi/main.wxs
index 1a5db6cc5868..a11b2ec4381c 100644
--- a/crates/tauri-bundler/src/bundle/windows/msi/main.wxs
+++ b/crates/tauri-bundler/src/bundle/windows/msi/main.wxs
@@ -70,9 +70,12 @@
         <Property Id="ARPURLUPDATEINFO" Value="{{homepage}}"/>
         {{/if}}
 
-        <!-- initialize with previous InstallDir -->
         <Property Id="INSTALLDIR">
-            <RegistrySearch Id="PrevInstallDirReg" Root="HKCU" Key="Software\\{{manufacturer}}\\{{product_name}}" Name="InstallDir" Type="raw"/>
+          <!-- First attempt: Search for "InstallDir" -->
+          <RegistrySearch Id="PrevInstallDirWithName" Root="HKCU" Key="Software\\{{manufacturer}}\\{{product_name}}" Name="InstallDir" Type="raw" />
+
+          <!-- Second attempt: If the first fails, search for the default key value (this is how the nsis installer currently stores the path) -->
+          <RegistrySearch Id="PrevInstallDirNoName" Root="HKCU" Key="Software\\{{manufacturer}}\\{{product_name}}" Type="raw" />
         </Property>
 
         <!-- launch app checkbox -->