summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2022-07-05 13:43:16 +0200
committerDavid Lönnhager <david.l@mullvad.net>2022-07-05 13:43:16 +0200
commit1840cb09fa74d6c01151c6ef6f0d2ff9b3a59aa6 (patch)
tree71cc62d151ee5aecacdfd426dc0ef94c3c99ad4b
parent3c1bea149790b7a809ab0538b5a64a64e5e9c728 (diff)
parent65ca1d5d809a8ef1ffd2e1f2f655d36445dce9b9 (diff)
downloadmullvadvpn-1840cb09fa74d6c01151c6ef6f0d2ff9b3a59aa6.tar.xz
mullvadvpn-1840cb09fa74d6c01151c6ef6f0d2ff9b3a59aa6.zip
Merge branch 'win-fix-st-list'
-rw-r--r--CHANGELOG.md2
-rw-r--r--talpid-core/src/split_tunnel/windows/mod.rs2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e57041974..004f747b7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,8 @@ Line wrap the file at 100 chars. Th
#### Windows
- Fix DNS issue on non-English Windows installations. Don't parse the output of ipconfig.exe
to determine if the tool succeeded.
+- Only use the most recent list of apps to split when resuming from hibernation/sleep if applying
+ it was successful.
### Security
#### Android
diff --git a/talpid-core/src/split_tunnel/windows/mod.rs b/talpid-core/src/split_tunnel/windows/mod.rs
index e79f135d4b..d177b4f198 100644
--- a/talpid-core/src/split_tunnel/windows/mod.rs
+++ b/talpid-core/src/split_tunnel/windows/mod.rs
@@ -454,8 +454,8 @@ impl SplitTunnel {
error.display_chain_with_msg("Failed to update path monitor")
);
}
+ *monitored_paths_guard = paths.to_vec();
}
- *monitored_paths_guard = paths.to_vec();
result
}