diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-11-07 16:44:47 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-11-07 16:06:58 +0000 |
| commit | a91df747a57c5a474d2748e215803e9659d684b3 (patch) | |
| tree | d35c8d2a60a332ba27494dccf080240aa69b76f8 | |
| parent | 61581bbeed0a7d4f1b4abbac804690184300fb1e (diff) | |
| download | wireshark-a91df747a57c5a474d2748e215803e9659d684b3.tar.gz | |
NSIS: clear errors before checking WinPcap uninstall registry entry
Otherwise it can lead to a false verdict in after the check for Wireshark uninstall registry entry
Bug: 10867
Change-Id: I213ac8ffadfb3578b05d33b996540bd4330a0ec5
Reviewed-on: https://code.wireshark.org/review/11621
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
(cherry picked from commit cdcf27255ab8907e7fe29b4518fca1c4e53202ab)
Reviewed-on: https://code.wireshark.org/review/11623
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 7f8a1a4e14..8aad3fbf5b 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -199,6 +199,9 @@ Var TMP_UNINSTALLER ; ============================================================================ !include x64.nsh +!include "GetWindowsVersion.nsh" +!include WinMessages.nsh + Function .onInit !if ${WIRESHARK_TARGET_PLATFORM} == "win64" ; http://forums.winamp.com/printthread.php?s=16ffcdd04a8c8d52bee90c0cae273ac5&threadid=262873 @@ -1219,8 +1222,6 @@ FunctionEnd !endif -!include "GetWindowsVersion.nsh" -!include WinMessages.nsh !include "VersionCompare.nsh" Var WINPCAP_NAME ; DisplayName from WinPcap installation @@ -1242,6 +1243,7 @@ Function myShowCallback WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 10" "Flags" "" !endif + ClearErrors ; detect if WinPcap should be installed WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "Text" "Install WinPcap ${PCAP_DISPLAY_VERSION}" ReadRegStr $WINPCAP_NAME HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "DisplayName" |