From 185735ca2cd8459b24d527ef6cf52a2ed0ed9dc7 Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 11 Sep 2015 19:43:20 +0200 Subject: [PATCH] + fixes #0002258: Silent uninstall blocks on MessageBox, fixes #0002056: Support silent (de)installation using NSIS --- src/WindowsInstaller/FreeCAD_WindowsInstaller.nsi | 2 +- src/WindowsInstaller/FreeCAD_x64_WindowsInstaller.nsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/WindowsInstaller/FreeCAD_WindowsInstaller.nsi b/src/WindowsInstaller/FreeCAD_WindowsInstaller.nsi index 59a4cce66..21ca2208b 100644 --- a/src/WindowsInstaller/FreeCAD_WindowsInstaller.nsi +++ b/src/WindowsInstaller/FreeCAD_WindowsInstaller.nsi @@ -124,7 +124,7 @@ function un.onInit SetShellVarContext all #Verify the uninstaller - last chance to back out - MessageBox MB_OKCANCEL "Permanantly remove ${APPNAME}?" IDOK next + MessageBox MB_OKCANCEL "Permanantly remove ${APPNAME}?" /SD IDOK IDOK next Abort next: !insertmacro VerifyUserIsAdmin diff --git a/src/WindowsInstaller/FreeCAD_x64_WindowsInstaller.nsi b/src/WindowsInstaller/FreeCAD_x64_WindowsInstaller.nsi index 975a4843e..184d92261 100644 --- a/src/WindowsInstaller/FreeCAD_x64_WindowsInstaller.nsi +++ b/src/WindowsInstaller/FreeCAD_x64_WindowsInstaller.nsi @@ -159,7 +159,7 @@ function un.onInit SetShellVarContext all #Verify the uninstaller - last chance to back out - MessageBox MB_OKCANCEL "Permanantly remove ${APPNAME}?" IDOK next + MessageBox MB_OKCANCEL "Permanantly remove ${APPNAME}?" /SD IDOK IDOK next Abort next: !insertmacro VerifyUserIsAdmin