diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-01-27 13:36:32 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-01-27 13:36:32 +0000 |
| commit | a3a8d103ae19a53a9f10b00db719447dd7b57ea0 (patch) | |
| tree | 49154261475659b9b1a609ce9eca7abf13a9c919 | |
| parent | 72a815a374da68edbc86f952e14a8e813fab6c3e (diff) | |
| download | rabbitmq-server-a3a8d103ae19a53a9f10b00db719447dd7b57ea0.tar.gz | |
Close the installer after starting the uninstaller, to prevent people accidentally bringing the installer to the front and continuing.
| -rw-r--r-- | packaging/windows-exe/rabbitmq_nsi.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packaging/windows-exe/rabbitmq_nsi.in b/packaging/windows-exe/rabbitmq_nsi.in index 0cdb13f0..2a261e01 100644 --- a/packaging/windows-exe/rabbitmq_nsi.in +++ b/packaging/windows-exe/rabbitmq_nsi.in @@ -178,14 +178,14 @@ Function .onInit ReadRegStr $0 HKLM ${uninstall} "UninstallString" ${If} $0 != "" - MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "RabbitMQ is already installed. $\n$\nClick 'OK' to remove the previous version or 'Cancel' to cancel this installation." IDOK uninst - - Abort + MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "RabbitMQ is already installed. $\n$\nClick 'OK' to remove the previous version or 'Cancel' to cancel this installation." IDCANCEL norun ;Run the uninstaller - uninst: - ClearErrors - Exec $INSTDIR\uninstall.exe + ClearErrors + ExecWait $INSTDIR\uninstall.exe + + norun: + Abort ${EndIf} FunctionEnd |