From 1305522e29f402ee60345609dbb232a385015d13 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Tue, 21 Feb 2012 17:59:04 +0100
Subject: [PATCH] move to right script (dumb failure)

---
 CLIENT_DATA/delsub.ins | 10 ++++++++++
 CLIENT_DATA/setup.ins  | 10 ----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CLIENT_DATA/delsub.ins b/CLIENT_DATA/delsub.ins
index d271279..c8f18d1 100644
--- a/CLIENT_DATA/delsub.ins
+++ b/CLIENT_DATA/delsub.ins
@@ -20,6 +20,8 @@ if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specif
 		comment "Uninstall program found, starting uninstall"
 		Winbatch_uninstall_32
 		sub_check_exitcode
+		Winbatch_please_wait_32
+		sub_check_exitcode
 	endif
 
 	if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId32$ + "] DisplayName") = "")
@@ -44,6 +46,8 @@ if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system spe
 		comment "Uninstall program found, starting uninstall"
 		Winbatch_uninstall_64
 		sub_check_exitcode
+		Winbatch_please_wait_64
+		sub_check_exitcode
 	endif
 
 	if not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId64$ + "] DisplayName") = "")
@@ -66,6 +70,12 @@ LinkFolder_uninstall
 net stop immunetprotect
 taskkill /IM iptray.exe
 
+[Winbatch_please_wait_32]
+"%ScriptPath%\please-wait.exe"
+
+[Winbatch_please_wait_64]
+"%ScriptPath%\please-wait.exe"
+
 [Winbatch_uninstall_32]
 ; Choose one of the following examples as basis for program uninstall
 ;
diff --git a/CLIENT_DATA/setup.ins b/CLIENT_DATA/setup.ins
index 9e29686..30adfb9 100644
--- a/CLIENT_DATA/setup.ins
+++ b/CLIENT_DATA/setup.ins
@@ -173,8 +173,6 @@ else
 		Files_install_32 /32Bit
 		Winbatch_install_32
 		Sub_check_exitcode
-		Winbatch_please_wait_32
-		Sub_check_exitcode
 		comment "Patch Registry"
 		Registry_install /32Bit
 		comment "Create shortcuts"
@@ -265,8 +263,6 @@ else
 		Files_install_64 /64Bit
 		Winbatch_install_64
 		Sub_check_exitcode
-		Winbatch_please_wait_64
-		Sub_check_exitcode
 		comment "Patch Registry"
 		Registry_install /64Bit
 		comment "Create shortcuts"
@@ -517,12 +513,6 @@ xml ed -O -u "/config/ui/notification/cloud" -v $ui_notification_cloud$ $Install
 
 
 
-[Winbatch_please_wait_32]
-"%ScriptPath%\please-wait.exe"
-
-[Winbatch_please_wait_64]
-"%ScriptPath%\please-wait.exe"
-
 [Winbatch_install_32]
 ; Choose one of the following examples as basis for your installation
 ; You can use $LicenseKey$ var to pass a license key to the installer