summaryrefslogtreecommitdiffhomepage
path: root/mullvad-daemon/src
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2017-12-04 11:15:38 +0100
committerLinus Färnstrand <linus@mullvad.net>2017-12-04 11:15:38 +0100
commit26d9f85b9c779ca18f935df9006ca6fad037aeb7 (patch)
tree421e8a350ec907bb7dbb0c4ddf31b06a9e21d238 /mullvad-daemon/src
parent08530bb297f5f1faff0ca5f6b68d33af03b217ea (diff)
parent98ad6988a8ad239af6ce6639269801d125156088 (diff)
downloadmullvadvpn-26d9f85b9c779ca18f935df9006ca6fad037aeb7.tar.xz
mullvadvpn-26d9f85b9c779ca18f935df9006ca6fad037aeb7.zip
Merge branch 'set-dns-on-macos'
Diffstat (limited to 'mullvad-daemon/src')
-rw-r--r--mullvad-daemon/src/main.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index 2adcb0a9b7..c1c7aa4980 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -562,8 +562,8 @@ impl Daemon {
Ok(())
}
(TargetState::Unsecured, TunnelState::NotRunning) => self.reset_security_policy(),
- (TargetState::Unsecured, TunnelState::Connecting) |
- (TargetState::Unsecured, TunnelState::Connected) => self.kill_tunnel(),
+ (TargetState::Unsecured, TunnelState::Connecting)
+ | (TargetState::Unsecured, TunnelState::Connected) => self.kill_tunnel(),
(..) => Ok(()),
}
}