diff options
| -rw-r--r-- | docbook/release-notes.asciidoc | 2 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc index e006166ca7..300343b20f 100644 --- a/docbook/release-notes.asciidoc +++ b/docbook/release-notes.asciidoc @@ -23,6 +23,8 @@ The following features are new (or have been significantly updated) since version 1.10: * Expert info is now filterable (if the dissector has been updated to support the new API). +* The Windows installer now uninstalls the previous version of Wireshark silently. +You can still run the uninstaller manually beforehand if you wish to run it interactively. === New Protocol Support diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 9d6c559134..8bfbfd64fa 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -248,14 +248,8 @@ prep_uninstaller: StrCpy $1 "$TEMP\${PROGRAM_NAME}_uninstaller.exe" StrCpy $2 1 System::Call 'kernel32::CopyFile(t r0, t r1, b r2) 1' - IfSilent silent_uninstall - ExecWait "$TMP_UNINSTALLER _?=$OLD_INSTDIR" - Goto cleanup - -silent_uninstall: ExecWait "$TMP_UNINSTALLER /S _?=$OLD_INSTDIR" -cleanup: Delete "$TMP_UNINSTALLER" done: |