diff options
| author | Odd Stranne <odd@mullvad.net> | 2020-07-20 18:26:07 +0200 |
|---|---|---|
| committer | Odd Stranne <odd@mullvad.net> | 2020-07-20 18:26:07 +0200 |
| commit | a7bcdd613a3705ad8353cb2828e9d10eceb9f2a1 (patch) | |
| tree | 0dcb37c622908d74a547940d9f06e3554d7a9fdc | |
| parent | f9c55e39194a22f78916ff0d0734eb9d79c4f388 (diff) | |
| parent | 73d372a73ebf6f9b4e62eba35b08b0fd0b97f3d0 (diff) | |
| download | mullvadvpn-a7bcdd613a3705ad8353cb2828e9d10eceb9f2a1.tar.xz mullvadvpn-a7bcdd613a3705ad8353cb2828e9d10eceb9f2a1.zip | |
Merge branch 'win-fix-exectostack-calls'
| -rw-r--r-- | dist-assets/windows/installer.nsh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/dist-assets/windows/installer.nsh b/dist-assets/windows/installer.nsh index 00682a569c..275659b008 100644 --- a/dist-assets/windows/installer.nsh +++ b/dist-assets/windows/installer.nsh @@ -726,6 +726,8 @@ ${EndIf} Pop $FullUninstall + log::Log "Running uninstaller for ${PRODUCT_NAME} ${VERSION}" + ${If} $FullUninstall != 1 # Save the target tunnel state if we're upgrading SetOutPath "$TEMP" @@ -747,6 +749,7 @@ # Discard return value Pop $0 + Pop $1 Sleep 5000 @@ -754,11 +757,10 @@ # Discard return value Pop $0 + Pop $1 Sleep 1000 - log::Log "Running uninstaller for ${PRODUCT_NAME} ${VERSION}" - ${RemoveCLIFromEnvironPath} # Remove the TAP adapter |