diff options
| author | David Lönnhager <david.l@mullvad.net> | 2020-01-23 18:29:58 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2020-01-23 18:39:51 +0100 |
| commit | afc8df13892a999658dd629df722a6604b9510a2 (patch) | |
| tree | b467a3527013374a90ca0eabf1e6e0f20877463f | |
| parent | 1bc708ad0764cceb5f1bf87c36862df90e4ccfd7 (diff) | |
| download | mullvadvpn-afc8df13892a999658dd629df722a6604b9510a2.tar.xz mullvadvpn-afc8df13892a999658dd629df722a6604b9510a2.zip | |
Fix file system redirection issue on Windows 7
| -rw-r--r-- | dist-assets/windows/installer.nsh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/dist-assets/windows/installer.nsh b/dist-assets/windows/installer.nsh index 74c4a7f050..2638e6401e 100644 --- a/dist-assets/windows/installer.nsh +++ b/dist-assets/windows/installer.nsh @@ -406,14 +406,13 @@ # !macro RemoveWintun Push $0 + Push $1 log::Log "RemoveWintun()" - ${DisableX64FSRedirection} msiutil::SilentUninstall "$TEMP\mullvad-wintun-amd64.msi" Pop $0 Pop $1 - ${EnableX64FSRedirection} ${If} $0 != ${MULLVAD_SUCCESS} StrCpy $R0 "Failed to remove Wintun: error $0" @@ -423,8 +422,12 @@ log::Log "RemoveWintun() completed successfully" + Push 0 + Pop $R0 + RemoveWintun_return_only: + Pop $1 Pop $0 !macroend @@ -443,12 +446,11 @@ log::Log "InstallWintun()" Push $0 + Push $1 - ${DisableX64FSRedirection} msiutil::SilentInstall "$TEMP\mullvad-wintun-amd64.msi" Pop $0 Pop $1 - ${EnableX64FSRedirection} ${If} $0 != ${MULLVAD_SUCCESS} StrCpy $R0 "Failed to install Wintun: error $0" @@ -463,6 +465,7 @@ InstallWintun_return: + Pop $1 Pop $0 !macroend |