summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2025-10-14 10:51:59 +0200
committerDavid Lönnhager <david.l@mullvad.net>2025-10-14 10:51:59 +0200
commit1edca6bde50afe026204a49b62c2a0a963f2870b (patch)
tree5d69ea777436774e88dd5d8db9088a0db1d1ce2a
parent2f3352e0fd5d186ff0cc34018463fbb6d93a987b (diff)
parentc9051a6bb1682ebef6579a2e3b9a71ae99cc1653 (diff)
downloadmullvadvpn-1edca6bde50afe026204a49b62c2a0a963f2870b.tar.xz
mullvadvpn-1edca6bde50afe026204a49b62c2a0a963f2870b.zip
Merge branch 'win-st-bsod-workaround'
-rw-r--r--CHANGELOG.md3
-rw-r--r--talpid-core/src/tunnel_state_machine/mod.rs9
2 files changed, 3 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7ada409ae..23ab57ce06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,9 @@ Line wrap the file at 100 chars. Th
#### macOS
- Fix high CPU usage on macOS 26 by updating Electron. This affected the app when it was visible.
+#### Windows
+- Mitigate BSOD caused by split tunnel driver during boot.
+
#### Linux
- Install AppArmor profile on all Linux distributions that support AppArmor abi 4.0.
diff --git a/talpid-core/src/tunnel_state_machine/mod.rs b/talpid-core/src/tunnel_state_machine/mod.rs
index 16e15d08a0..1ea42e85c4 100644
--- a/talpid-core/src/tunnel_state_machine/mod.rs
+++ b/talpid-core/src/tunnel_state_machine/mod.rs
@@ -367,15 +367,6 @@ impl TunnelStateMachine {
)
.map_err(Error::InitSplitTunneling);
- if result.is_err()
- && let Some(log_dir) = &args.log_dir
- {
- log::debug!("Logging device info");
- if let Err(err) = crate::logging::diag::windows::log_device_info(log_dir).await {
- log::error!("Failed to dump device logs: {err}");
- }
- }
-
result?
};