From f59000778e014943de81d674619aefb7a3037e4e Mon Sep 17 00:00:00 2001
From: Tom Butcher <thomasbutcher15@gmail.com>
Date: Sun, 2 Aug 2026 02:53:46 +0100
Subject: [PATCH] Refactor Windows MSI installer configuration for improved
 uninstall handling

- Updated custom actions in the MSI wrapped configuration to use a unified property for command line execution.
- Simplified the install sequence by adjusting conditions for running the installer and uninstalling previous versions.
- Enhanced clarity and maintainability of the installer script.
---
 packaging/windows/msi-wrapped.wxs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/packaging/windows/msi-wrapped.wxs b/packaging/windows/msi-wrapped.wxs
index 014b897..3dcc93d 100644
--- a/packaging/windows/msi-wrapped.wxs
+++ b/packaging/windows/msi-wrapped.wxs
@@ -81,19 +81,19 @@
 
     <CustomAction
       Id="SetKillFarmControl"
-      Property="QtKillFarmControl"
+      Property="QtExecCmdLine"
       Value="taskkill.exe /F /IM launcher.exe /T"
       Execute="immediate" />
 
     <CustomAction
       Id="SetUninstallPreviousFromRegistry"
-      Property="QtUninstallPrevious"
+      Property="QtExecCmdLine"
       Value="&quot;[PREVIOUS_UNINSTALL_CMD]&quot; /S"
       Execute="immediate" />
 
     <CustomAction
       Id="SetUninstallPreviousFromInstallDir"
-      Property="QtUninstallPrevious"
+      Property="QtExecCmdLine"
       Value="&quot;[PREVIOUS_INSTALL_DIR]Uninstall.exe&quot; /S"
       Execute="immediate" />
 
@@ -102,10 +102,8 @@
       <Custom Action="KillFarmControl" After="SetKillFarmControl">NOT Installed</Custom>
       <Custom Action="SetUninstallPreviousFromRegistry" After="KillFarmControl">NOT Installed AND PREVIOUS_UNINSTALL_CMD</Custom>
       <Custom Action="SetUninstallPreviousFromInstallDir" After="KillFarmControl">NOT Installed AND NOT PREVIOUS_UNINSTALL_CMD AND PREVIOUS_INSTALL_DIR</Custom>
-      <Custom Action="UninstallPrevious" After="SetUninstallPreviousFromRegistry">NOT Installed AND (PREVIOUS_UNINSTALL_CMD OR PREVIOUS_INSTALL_DIR)</Custom>
       <Custom Action="UninstallPrevious" After="SetUninstallPreviousFromInstallDir">NOT Installed AND (PREVIOUS_UNINSTALL_CMD OR PREVIOUS_INSTALL_DIR)</Custom>
-      <Custom Action="RunInstaller" After="UninstallPrevious">NOT Installed AND (PREVIOUS_UNINSTALL_CMD OR PREVIOUS_INSTALL_DIR)</Custom>
-      <Custom Action="RunInstaller" After="KillFarmControl">NOT Installed AND NOT PREVIOUS_UNINSTALL_CMD AND NOT PREVIOUS_INSTALL_DIR</Custom>
+      <Custom Action="RunInstaller" After="UninstallPrevious">NOT Installed</Custom>
     </InstallExecuteSequence>
   </Product>
 </Wix>