summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2021-11-19 13:24:55 +0100
committerDavid Lönnhager <david.l@mullvad.net>2021-11-19 13:24:55 +0100
commitaa091ad614aa806470189ee3045144df24be88d9 (patch)
treeb005a3c2db30d3ecb552c0029f47693cec4d6f4d
parent826e74cf57a40e3159ea7c87c1ef5526bc04ca5a (diff)
parent079d193ca8c3f120d4359209defc3bb3d7bf8ef1 (diff)
downloadmullvadvpn-aa091ad614aa806470189ee3045144df24be88d9.tar.xz
mullvadvpn-aa091ad614aa806470189ee3045144df24be88d9.zip
Merge branch 'win-st-fix-empty-filtered-list'
-rw-r--r--CHANGELOG.md1
-rw-r--r--talpid-core/src/split_tunnel/windows/driver.rs4
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f524fb50f8..d83727b056 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ Line wrap the file at 100 chars. Th
### Fixed
#### Windows
- Fix app size after changing display scale.
+- Fix daemon not starting if all excluded app paths reside on non-existent/unmounted volumes.
## [2021.6] - 2021-11-17
diff --git a/talpid-core/src/split_tunnel/windows/driver.rs b/talpid-core/src/split_tunnel/windows/driver.rs
index e82f932dd0..8f7c7198f6 100644
--- a/talpid-core/src/split_tunnel/windows/driver.rs
+++ b/talpid-core/src/split_tunnel/windows/driver.rs
@@ -328,6 +328,10 @@ impl DeviceHandle {
}
}
+ if device_paths.is_empty() {
+ return self.clear_config();
+ }
+
log::debug!("Excluded device paths:");
for path in &device_paths {
log::debug!(" {:?}", path);