diff options
| author | David Lönnhager <david.l@mullvad.net> | 2022-12-14 14:23:00 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2022-12-14 14:23:00 +0100 |
| commit | 9fa1645c4de5bb1242b92636135697ef9dce0b9c (patch) | |
| tree | 64e5fe304fa3ce2f2a72b415a5e7361332f57210 | |
| parent | 2bc39a927897f132ca829e0761809dd922f7265f (diff) | |
| parent | 8cee2867fb39f5f469342d0de34de5068dd03b76 (diff) | |
| download | mullvadvpn-9fa1645c4de5bb1242b92636135697ef9dce0b9c.tar.xz mullvadvpn-9fa1645c4de5bb1242b92636135697ef9dce0b9c.zip | |
Merge branch 'win-clear-nsis-flag'
| -rw-r--r-- | dist-assets/windows/installer.nsh | 4 |
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 |