From be8cd3e8df40cc0751ed5e4de9ed74edd8fa063c Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@montyprogram.com>
Date: Tue, 6 Mar 2012 01:46:32 +0100
Subject: LP947631: Uninstall wipes HeidiSQL settings, even if HeidiSQL is
 installed prior to MariaDB

Fixed detection of installed HeidiSQL in the machine, prevent installing own copy if HeidiSQL is already installed.

On deinstallation, do not remove settings if official HeidiSQL is detected.
---
 win/packaging/heidisql.wxi.in         | 9 +++++++--
 win/packaging/heidisql_feature.wxi.in | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'win/packaging')

diff --git a/win/packaging/heidisql.wxi.in b/win/packaging/heidisql.wxi.in
index 2af52862e06..1e6e3d552a8 100644
--- a/win/packaging/heidisql.wxi.in
+++ b/win/packaging/heidisql.wxi.in
@@ -3,7 +3,7 @@
 <RegistrySearch Id="HeidiSQL"
           Root="HKLM"
           Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\HeidiSQL_is1"
-          Name="Install"
+          Name="UninstallString"
           Type="raw"
           Win64="no"
 />
@@ -30,11 +30,15 @@
     <Component Id="component.HeidiSQL_MenuShortcut" Guid="*" Win64="no">
       <RegistryValue  Root="HKCU" Key="Software\@CPACK_WIX_PACKAGE_NAME@\Uninstall" Name="shortcuts.heidisql" Value="1" Type="string" KeyPath="yes"  />
       <Shortcut Id="startmenuHeidiSQL" Directory="ShortcutFolder" Name="HeidiSQL"  Target="[D.HeidiSQL]\heidisql.exe"/>
-      <RemoveRegistryKey Id="HeidiSQL_RegistryCleanup" Root="HKCU" Key="SOFTWARE\HeidiSQL" Action="removeOnUninstall" />
     </Component>
     <Component Id="component.HeidiSQL_libmysql.dll" Guid="*" Win64="no">
       <File Id="heidisql.libmysql.dll" Name="libmysql.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libmysql.dll" />
     </Component>
+    <Component Id="component.HeidiSQL_CleanupSettings" Guid="*" Win64="no">
+     <Condition>HEIDISQLINSTALLED</Condition>
+     <RegistryValue  Root="HKCU" Key="Software\@CPACK_WIX_PACKAGE_NAME@\UninstallCleanupHeidiSQLSettings" Name="cleanup.heidisql" Value="1" Type="string" KeyPath="yes"  />
+     <RemoveRegistryKey Id="HeidiSQL_RegistryCleanup" Root="HKCU" Key="SOFTWARE\HeidiSQL" Action="removeOnUninstall" />
+    </Component>
   </Directory>
 </DirectoryRef>
 
@@ -42,5 +46,6 @@
   <ComponentRef Id="component.HeidiSQL"/>
   <ComponentRef Id="component.HeidiSQL_MenuShortcut"/>
   <ComponentRef Id="component.HeidiSQL_libmysql.dll"/>
+  <ComponentRef Id="component.HeidiSQL_CleanupSettings"/>
 </ComponentGroup>
 </Include>
diff --git a/win/packaging/heidisql_feature.wxi.in b/win/packaging/heidisql_feature.wxi.in
index 9fceb4689d0..3f60fcd8f27 100644
--- a/win/packaging/heidisql_feature.wxi.in
+++ b/win/packaging/heidisql_feature.wxi.in
@@ -4,7 +4,7 @@
    Description= 'Powerful, easy and free MySQL/MariaDB GUI client by Ansgar Becker'
    AllowAdvertise='no'
    Level='1'>
-   <Condition Level="0">HEIDISQLINSTALLED</Condition>
+   <Condition Level="0">HEIDISQLINSTALLED AND NOT REMOVE ~= ALL</Condition>
    <ComponentGroupRef Id='HeidiSQL'/>
 </Feature>
 </Include>
-- 
cgit v1.2.1