diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-06-06 18:46:37 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-06-06 18:46:37 +0000 |
| commit | 1a95757f46321f0a63687528a87dc1a6870d3c13 (patch) | |
| tree | af40b3cd7b553c74cc96294ce99f2e14bc49eab3 /packaging/nsis/uninstall.nsi | |
| parent | 727f37e8049dcaacbb4b4dd04e0c5bec0b3f4215 (diff) | |
I suspect "ie4uinit" got its name because "mysterious useful undocumented
system utility" would have been too obvious. Have UpdateIcons call
"ie4uinit -ClearIconCache" and move UpdateIcons to the "-{,Un.}Finally"
sections in the installer and uninstaller.
svn path=/trunk/; revision=49811
Diffstat (limited to 'packaging/nsis/uninstall.nsi')
| -rwxr-xr-x | packaging/nsis/uninstall.nsi | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi index 2de9e610b3..22ae242d79 100755 --- a/packaging/nsis/uninstall.nsi +++ b/packaging/nsis/uninstall.nsi @@ -133,7 +133,6 @@ Call un.Disassociate DeleteRegKey HKCR ${WIRESHARK_ASSOC} DeleteRegKey HKCR "${WIRESHARK_ASSOC}\Shell\open\command" DeleteRegKey HKCR "${WIRESHARK_ASSOC}\DefaultIcon" -!insertmacro UpdateIcons Delete "$INSTDIR\etc\gtk-2.0\*.*" Delete "$INSTDIR\etc\gtk-3.0\*.*" @@ -285,6 +284,9 @@ SectionEnd Section "-Un.Finally" ;------------------------------------------- SectionIn 1 2 + +!insertmacro UpdateIcons + ; this test must be done after all other things uninstalled (e.g. Global Settings) IfFileExists "$INSTDIR" 0 NoFinalErrorMsg MessageBox MB_OK "Unable to remove $INSTDIR." /SD IDOK IDOK 0 ; skipped if dir doesn't exist |