From 2974ff649ecbedace82c3aea7af6f41f1811e037 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Sun, 19 Feb 2012 11:08:53 +0100
Subject: [PATCH] correct silent uinstall

---
 CLIENT_DATA/delsub32.ins | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins
index daec0d6..8156a0d 100644
--- a/CLIENT_DATA/delsub32.ins
+++ b/CLIENT_DATA/delsub32.ins
@@ -11,6 +11,8 @@ Message "Uninstalling " + $ProductId$ + " ..."
 
 if FileExists($UninstallProgram$)
 	comment "Uninstall program found, starting uninstall"
+	Dosbatch_uninstall
+	sub_check_exitcode
 	Winbatch_uninstall
 	sub_check_exitcode
 endif
@@ -29,13 +31,14 @@ Registry_uninstall /32Bit
 comment "Delete program shortcuts"
 LinkFolder_uninstall
 
-[Winbatch_uninstall]
+[Dosbatch_uninstall]
 ; Choose one of the following examples as basis for program uninstall
 ;
 ; PuTTY 0.58+ uninstallers call 'putty -cleanup-during-uninstall' during uninstall. This causes a pop-up to appear which breaks the silent uninstall.
-copy -s "%System%\print.exe" "$InstallDir$\putty.exe"
+copy /Y "%System%\print.exe" "$InstallDir$\putty.exe"
+
+[Winbatch_uninstall]
 "$UninstallProgram$" /sp- /verysilent /norestart
-delete -sf "$InstallDir$\"
 
 [Winbatch_uninstall_msi]
 msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress
@@ -43,6 +46,7 @@ msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress
 [Files_uninstall]
 ; Example for recursively deleting the installation directory (don't forget the trailing backslash):
 ;
+delete -sf "$InstallDir$\"
 
 [Registry_uninstall]
 ; Example of deleting a registry key: