diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-03-08 18:23:58 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-03-08 18:23:58 +0000 |
| commit | a606a88647404ed46c0c356ee9e2713fd5d11b61 (patch) | |
| tree | 4e6db6e8ef2639f2d2916c389ba2bc6b657005a0 /packaging/nsis/uninstall.nsi | |
| parent | 1b788d4061eb86678c4562ae12114385f171413b (diff) | |
| download | wireshark-a606a88647404ed46c0c356ee9e2713fd5d11b61.tar.gz | |
Add /SD defaults to every MessageBox call (even if they're commented
out). Fixes bug 8451.
Don't yell at the user so much.
svn path=/trunk/; revision=48196
Diffstat (limited to 'packaging/nsis/uninstall.nsi')
| -rwxr-xr-x | packaging/nsis/uninstall.nsi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi index c215667bf1..4b3001a550 100755 --- a/packaging/nsis/uninstall.nsi +++ b/packaging/nsis/uninstall.nsi @@ -115,7 +115,7 @@ ${DoUntil} $EXECUTABLE == ${EXECUTABLE_MARKER} ; into any problems here. Delete "$INSTDIR\$EXECUTABLE.exe" IfErrors 0 deletionSuccess - MessageBox MB_OK "$EXECUTABLE.exe could not be removed. Is it in use?" IDOK 0 + MessageBox MB_OK "$EXECUTABLE.exe could not be removed. Is it in use?" /SD IDOK IDOK 0 Abort "$EXECUTABLE.exe could not be removed. Aborting the uninstall process." deletionSuccess: @@ -269,7 +269,7 @@ Section /o "Un.WinPcap" un.SecWinPcap SectionIn 2 ReadRegStr $1 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "UninstallString" ;IfErrors un.lbl_winpcap_notinstalled ;if RegKey is unavailable, WinPcap is not installed -;MessageBox MB_OK "WinPcap $1" +;MessageBox MB_OK "WinPcap $1" /SD IDOK ExecWait '$1' $0 DetailPrint "WinPcap uninstaller returned $0" ;SetRebootFlag true @@ -281,7 +281,7 @@ Section "-Un.Finally" SectionIn 1 2 ; this test must be done after all other things uninstalled (e.g. Global Settings) IfFileExists "$INSTDIR" 0 NoFinalErrorMsg - MessageBox MB_OK "Please note: The directory $INSTDIR could not be removed!" IDOK 0 ; skipped if dir doesn't exist + MessageBox MB_OK "Unable to remove $INSTDIR." /SD IDOK IDOK 0 ; skipped if dir doesn't exist NoFinalErrorMsg: SectionEnd |