summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2017-07-03 14:20:51 +0200
committerLinus Färnstrand <linus@mullvad.net>2017-07-03 14:24:48 +0200
commitb96fade3d14c307237f681840443e3d166280d4b (patch)
tree63ed225edd9d9e3dd5bf371383d721bd01c1bb50
parenta97f6e39203c442e17859be031d144c17d426bb5 (diff)
downloadmullvadvpn-b96fade3d14c307237f681840443e3d166280d4b.tar.xz
mullvadvpn-b96fade3d14c307237f681840443e3d166280d4b.zip
Change so using the state machine invalidly errors
-rw-r--r--mullvad_daemon/src/main.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/mullvad_daemon/src/main.rs b/mullvad_daemon/src/main.rs
index d29c2a5d44..f00a211d2c 100644
--- a/mullvad_daemon/src/main.rs
+++ b/mullvad_daemon/src/main.rs
@@ -283,7 +283,9 @@ impl Daemon {
}
self.apply_target_state()
} else {
- Ok(())
+ // Calling set_state with the same state we already have is an error. Should try to
+ // mitigate this possibility completely with a better state machine later.
+ Err(ErrorKind::InvalidState.into())
}
}