From 80606ef0405165d8e8baa76d0a50923e8da1b3ec Mon Sep 17 00:00:00 2001
From: Nick Bolton <nick@symless.com>
Date: Fri, 7 Mar 2025 15:27:15 +0000
Subject: [PATCH] fix: Add check for Visual C++ Redistributable installation in
 WiX patch

---
 deploy/windows/wix-patch.xml.in | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/deploy/windows/wix-patch.xml.in b/deploy/windows/wix-patch.xml.in
index fe97599ad..55fd1e9b6 100644
--- a/deploy/windows/wix-patch.xml.in
+++ b/deploy/windows/wix-patch.xml.in
@@ -18,15 +18,33 @@
     </ServiceInstall>
     <ServiceControl Id="ServiceControl" Name="Deskflow" Remove="uninstall" Start="install" Stop="both"/>
   </CPackWiXFragment>
+
   <CPackWiXFragment Id="CM_CP_deskflow_server.exe">
     <firewall:FirewallException Id="ServerFirewallException" Name="Deskflow Server" Program="[INSTALL_ROOT]deskflow-server.exe" Scope="any"/>
   </CPackWiXFragment>
+
   <CPackWiXFragment Id="CM_CP_deskflow_client.exe">
     <firewall:FirewallException Id="ClientFirewallException" Name="Deskflow Client" Program="[INSTALL_ROOT]deskflow-client.exe" Scope="any"/>
   </CPackWiXFragment>
+
   <CPackWiXFragment Id="#PRODUCT">
+    <Property Id="VC_REDIST_INSTALLED">
+      <RegistrySearch
+        Id="FindVCRedist"
+        Root="HKLM"
+        Key="SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64"
+        Name="Installed"
+        Type="raw" />
+    </Property>
+
     <CustomAction Id="Run_Deskflow" ExeCommand="Deskflow" FileRef="CM_FP_deskflow.exe" Return="asyncNoWait"/>
+    
+    <CustomAction
+      Id="ShowVCRedistError"
+      Error="Latest Microsoft Visual C++ Redistributable is required. Please install it before proceeding."/>
+
     <InstallExecuteSequence>
+      <Custom Action="ShowVCRedistError" Before="InstallServices" Condition="NOT Installed AND NOT VC_REDIST_INSTALLED"/>
       <Custom Action="Run_Deskflow" OnExit="success" Condition="NOT Installed"/>
     </InstallExecuteSequence>
   </CPackWiXFragment>