diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2018-05-07 09:57:16 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2018-05-07 09:57:16 -0300 |
| commit | d465523855afe9db59dfa134b48b2b088f228f67 (patch) | |
| tree | 25c0a3ab99ac10747bc17d5668dc1b049f53aae8 /mullvad-daemon | |
| parent | 083fa2b11bb3ac32e62ecabe4a66ab4c1a94d68c (diff) | |
| parent | 18d7104e65def1d6c9d7c7f7f303f8edc82b8838 (diff) | |
| download | mullvadvpn-d465523855afe9db59dfa134b48b2b088f228f67.tar.xz mullvadvpn-d465523855afe9db59dfa134b48b2b088f228f67.zip | |
Merge branch 'ipc-client-credentials'
Diffstat (limited to 'mullvad-daemon')
| -rw-r--r-- | mullvad-daemon/src/rpc_uniqueness_check.rs | 2 | ||||
| -rw-r--r-- | mullvad-daemon/tests/common/mod.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mullvad-daemon/src/rpc_uniqueness_check.rs b/mullvad-daemon/src/rpc_uniqueness_check.rs index fd889cdddf..96f1e9c15c 100644 --- a/mullvad-daemon/src/rpc_uniqueness_check.rs +++ b/mullvad-daemon/src/rpc_uniqueness_check.rs @@ -9,7 +9,7 @@ use mullvad_ipc_client::DaemonRpcClient; /// other daemon has stopped. pub fn is_another_instance_running() -> bool { match DaemonRpcClient::new() { - Ok(client) => match client.get_state() { + Ok(mut client) => match client.get_state() { Ok(_) => true, Err(error) => { let chained_error = error.chain_err(|| { diff --git a/mullvad-daemon/tests/common/mod.rs b/mullvad-daemon/tests/common/mod.rs index 84bd84a3ed..5356f4ee1e 100644 --- a/mullvad-daemon/tests/common/mod.rs +++ b/mullvad-daemon/tests/common/mod.rs @@ -99,7 +99,7 @@ impl DaemonRunner { fn request_clean_shutdown(&mut self, _: &mut duct::Handle) -> bool { use self::mullvad_ipc_client::DaemonRpcClient; - if let Ok(rpc_client) = DaemonRpcClient::new() { + if let Ok(mut rpc_client) = DaemonRpcClient::new() { rpc_client.shutdown().is_ok() } else { false |