From d4569b1d38f33a23d33e5adfa9e00c5aae51a111 Mon Sep 17 00:00:00 2001 From: Steven Robertson Date: Sun, 3 Apr 2011 20:23:32 +0800 Subject: [PATCH] EnsureTomahawkShutdown not required in uninstaller. --- admin/win/nsi/tomahawk.nsi | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/admin/win/nsi/tomahawk.nsi b/admin/win/nsi/tomahawk.nsi index 28bdb4c59..e7f1ce251 100644 --- a/admin/win/nsi/tomahawk.nsi +++ b/admin/win/nsi/tomahawk.nsi @@ -189,14 +189,9 @@ FunctionEnd no_process_${processName}_to_end: !macroend -!macro EnsureTomahawkShutdown un - Function ${un}EnsureTomahawkShutdown - !insertmacro CheckAndConfirmEndProcess "tomahawk.exe" - FunctionEnd -!macroend - -!insertmacro EnsureTomahawkShutdown "" -!insertmacro EnsureTomahawkShutdown "un." +Function EnsureTomahawkShutdown + !insertmacro CheckAndConfirmEndProcess "tomahawk.exe" +FunctionEnd ############################################################################## # #