summaryrefslogtreecommitdiffhomepage
path: root/mullvad_daemon/src
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2017-07-03 14:29:47 +0200
committerLinus Färnstrand <linus@mullvad.net>2017-07-03 14:29:47 +0200
commit9b8fcbe769dddce48983fb74e820324ec3e32a7d (patch)
treefb4ecf6d8c0e913739348bc94c681ca49a6706b8 /mullvad_daemon/src
parente040f561b96b6e5b5cc05010e0200dbd099cb72a (diff)
downloadmullvadvpn-9b8fcbe769dddce48983fb74e820324ec3e32a7d.tar.xz
mullvadvpn-9b8fcbe769dddce48983fb74e820324ec3e32a7d.zip
Wait for tunnel exit before quitting daemon
Diffstat (limited to 'mullvad_daemon/src')
-rw-r--r--mullvad_daemon/src/main.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/mullvad_daemon/src/main.rs b/mullvad_daemon/src/main.rs
index f2c6f46835..536de43012 100644
--- a/mullvad_daemon/src/main.rs
+++ b/mullvad_daemon/src/main.rs
@@ -193,7 +193,7 @@ impl Daemon {
pub fn run(mut self) -> Result<()> {
while let Ok(event) = self.rx.recv() {
self.handle_event(event)?;
- if self.shutdown {
+ if self.shutdown && self.state == TunnelState::NotRunning {
break;
}
}