summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2022-12-08 17:52:03 +0100
committerDavid Lönnhager <david.l@mullvad.net>2022-12-14 14:21:43 +0100
commit8cee2867fb39f5f469342d0de34de5068dd03b76 (patch)
tree64e5fe304fa3ce2f2a72b415a5e7361332f57210
parent2bc39a927897f132ca829e0761809dd922f7265f (diff)
downloadmullvadvpn-8cee2867fb39f5f469342d0de34de5068dd03b76.tar.xz
mullvadvpn-8cee2867fb39f5f469342d0de34de5068dd03b76.zip
Ignore potentially spurious errors when removing app files
-rw-r--r--dist-assets/windows/installer.nsh4
1 files changed, 4 insertions, 0 deletions
diff --git a/dist-assets/windows/installer.nsh b/dist-assets/windows/installer.nsh
index d9a7d5583e..2dce94038b 100644
--- a/dist-assets/windows/installer.nsh
+++ b/dist-assets/windows/installer.nsh
@@ -855,6 +855,7 @@
# If $INSTDIR is gone or can be removed, proceed anyway
#
IfFileExists $INSTDIR\*.* 0 customUnInstallCheck_Done
+ ClearErrors
RMDir /r $INSTDIR
IfErrors 0 customUnInstallCheck_Done
@@ -1086,6 +1087,7 @@
# Remove application files
log::Log "Deleting $INSTDIR"
+ ClearErrors
RMDir /r $INSTDIR
IfErrors 0 customRemoveFiles_final_cleanup
@@ -1139,6 +1141,8 @@
${UnloadPlugins}
+ ClearErrors
+
Pop $R0
Pop $1
Pop $0