diff options
| author | David Lönnhager <david.l@mullvad.net> | 2022-11-18 10:02:56 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2022-11-18 10:02:56 +0100 |
| commit | 499c06decda37dc639e5f944f98eff422a7e6131 (patch) | |
| tree | 13e5c9344ab386a81f2885d384574db5f66cf79d | |
| parent | 3e9a75b8f06c3293a48b8aff95ac90c1bd3a814e (diff) | |
| parent | 638be9b1107c52ba01014c63bc83816b80e421f2 (diff) | |
| download | mullvadvpn-499c06decda37dc639e5f944f98eff422a7e6131.tar.xz mullvadvpn-499c06decda37dc639e5f944f98eff422a7e6131.zip | |
Merge branch 'win-full-silent-uninstall'
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | dist-assets/windows/installer.nsh | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 521a68d3ea..2e008fecb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,8 @@ Line wrap the file at 100 chars. Th #### Android - Add privacy policy link in settings. +#### Windows +- Remove all settings when the app is uninstalled silently. ### Fixed - When a country is selected, and the constraints only match relays that are not included on the diff --git a/dist-assets/windows/installer.nsh b/dist-assets/windows/installer.nsh index 2e1f253189..d9a7d5583e 100644 --- a/dist-assets/windows/installer.nsh +++ b/dist-assets/windows/installer.nsh @@ -1030,7 +1030,7 @@ ${ExtractDriverlogic} ${ExtractMullvadSetup} - ${If} $Silent == 1 + ${If} ${isUpdated} ReadRegStr $NewVersion HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${APP_GUID}" "NewVersion" nsExec::ExecToStack '"$PLUGINSDIR\mullvad-setup.exe" is-older-version $0' @@ -1122,10 +1122,13 @@ ${RemoveLogsAndCache} ${If} $Silent != 1 MessageBox MB_ICONQUESTION|MB_YESNO "Would you like to remove settings files as well?" IDNO customRemoveFiles_after_remove_settings - ${RemoveSettings} - - DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "net.mullvad.vpn" + ${ElseIf} ${isUpdated} + Goto customRemoveFiles_after_remove_settings ${EndIf} + + ${RemoveSettings} + DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "net.mullvad.vpn" + customRemoveFiles_after_remove_settings: ${Else} log::SetLogTarget ${LOG_VOID} |