summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorEmīls Piņķis <emils@mullvad.net>2019-08-07 17:58:57 +0100
committerEmīls Piņķis <emils@mullvad.net>2019-08-07 17:58:57 +0100
commitfffab05b9fd2e9c7e1aed031a875f2d85b95ac1e (patch)
treeb3c484fb38fcf7caf5d776ee2d909bf93da9d59a
parentbcdaa69da080c565626e5a2bf7b13c79a54cc932 (diff)
parentf26e6f5add25e2713264cdb001be77f212ac2449 (diff)
downloadmullvadvpn-fffab05b9fd2e9c7e1aed031a875f2d85b95ac1e.tar.xz
mullvadvpn-fffab05b9fd2e9c7e1aed031a875f2d85b95ac1e.zip
Merge branch 'win-disable-key-generation'
-rw-r--r--mullvad-daemon/src/lib.rs5
1 files changed, 5 insertions, 0 deletions
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs
index 70acaead19..21c6f0ea11 100644
--- a/mullvad-daemon/src/lib.rs
+++ b/mullvad-daemon/src/lib.rs
@@ -1208,7 +1208,12 @@ where
}
}
+ #[cfg_attr(target_os = "windows", allow(unreachable_code))]
fn ensure_wireguard_keys_for_current_account(&mut self) {
+ #[cfg(target_os = "windows")]
+ {
+ return;
+ }
if let Some(account) = self.settings.get_account_token() {
if self
.account_history