From ad1eb5623490559be8eb1858a45c7b1e2d210107 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul@snyman.info>
Date: Thu, 2 May 2019 22:08:14 -0700
Subject: [PATCH] Remove old InnoSetup installer

---
 windows/OpenLP-base.wxs | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/windows/OpenLP-base.wxs b/windows/OpenLP-base.wxs
index feb6e95..d0049e5 100644
--- a/windows/OpenLP-base.wxs
+++ b/windows/OpenLP-base.wxs
@@ -128,5 +128,25 @@
       <Custom Action='PreventDowngrading' After='FindRelatedProducts'>NEWPRODUCTFOUND</Custom>
     </InstallUISequence>
     <CustomAction Id='PreventDowngrading' Error='Newer version already installed' />
+    <Property Id='INNO_UNINSTALLER_64'>
+      <RegistrySearch Id='LocateInnoUninstaller64' Type='file' Root='HKLM'
+        Key='SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\{AA7699FA-B2D2-43F4-8A70-D497D03C9485}_is1'
+        Name='UninstallString'>
+        <FileSearch Id='InnoUninstallerExe64' Name='unins000.exe' />
+      </RegistrySearch>
+    </Property>
+    <Property Id='INNO_UNINSTALLER_32'>
+      <RegistrySearch Id='LocateInnoUninstaller32' Type='file' Root='HKLM'
+        Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{AA7699FA-B2D2-43F4-8A70-D497D03C9485}_is1'
+        Name='UninstallString'>
+        <FileSearch Id='InnoUninstallerExe32' Name='unins000.exe' />
+      </RegistrySearch>
+    </Property>
+    <CustomAction Id="ca.RemoveInno64" Property="INNO_UNINSTALLER_64" ExeCommand="/SILENT" Return="check" />
+    <CustomAction Id="ca.RemoveInno32" Property="INNO_UNINSTALLER_32" ExeCommand="/SILENT" Return="check" />
+    <InstallExecuteSequence>
+      <Custom Action="ca.RemoveInno64" Before="InstallFiles">INNO_UNINSTALLER_64</Custom>
+      <Custom Action="ca.RemoveInno32" Before="InstallFiles"><![CDATA[INNO_UNINSTALLER_32 AND NOT INNO_UNINSTALLER_64]]></Custom>
+    </InstallExecuteSequence>
   </Product>
 </Wix>