summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2021-06-11 13:00:36 +0200
committerDavid Lönnhager <david.l@mullvad.net>2021-06-11 13:00:36 +0200
commit6d5b31aa5aa83fb56cccc7d828e5575659555b5b (patch)
tree6406d663cc02a102cb91bdc24ed24ba7e914bed3
parent7969053b99d1cb6186659f0458a2ed3a8af4c23e (diff)
parent77377d273b0523e5a4620589559fac226109dd24 (diff)
downloadmullvadvpn-6d5b31aa5aa83fb56cccc7d828e5575659555b5b.tar.xz
mullvadvpn-6d5b31aa5aa83fb56cccc7d828e5575659555b5b.zip
Merge branch 'fix-slow-openvpn-kill'
-rw-r--r--talpid-core/src/tunnel/openvpn/mod.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/talpid-core/src/tunnel/openvpn/mod.rs b/talpid-core/src/tunnel/openvpn/mod.rs
index 44efa96668..b6817bc591 100644
--- a/talpid-core/src/tunnel/openvpn/mod.rs
+++ b/talpid-core/src/tunnel/openvpn/mod.rs
@@ -770,6 +770,7 @@ impl<C: OpenVpnBuilder + Send + 'static> OpenVpnMonitor<C> {
};
if self.closed.load(Ordering::SeqCst) {
+ let _ = child.kill();
return WaitResult::Preparation(Ok(()));
}