summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorEmīls <emils@mullvad.net>2021-03-08 13:46:53 +0000
committerEmīls <emils@mullvad.net>2021-03-08 14:40:42 +0000
commit56fabb72876c82b3178b830fa649778a83459116 (patch)
treefba8e8a348eea22797324c08fec56560c0711f7c
parentdfb4ea26858ea1db9ae51e218728bba4105f82e8 (diff)
downloadmullvadvpn-56fabb72876c82b3178b830fa649778a83459116.tar.xz
mullvadvpn-56fabb72876c82b3178b830fa649778a83459116.zip
Ignore IPC socket on Android
-rw-r--r--mullvad-daemon/src/lib.rs2
-rw-r--r--mullvad-daemon/src/main.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs
index 945e388999..ff9228ef76 100644
--- a/mullvad-daemon/src/lib.rs
+++ b/mullvad-daemon/src/lib.rs
@@ -755,7 +755,7 @@ where
mem::drop(event_listener);
mem::drop(rpc_runtime);
- #[cfg(not(windows))]
+ #[cfg(any(target_os = "macos", target_os = "linux"))]
if let Err(err) = fs::remove_file(mullvad_paths::get_rpc_socket_path()) {
if err.kind() != std::io::ErrorKind::NotFound {
log::error!("Failed to remove old RPC socket: {}", err);
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index 199fa84152..68fc2bd5e8 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -98,7 +98,7 @@ async fn run_standalone(log_dir: Option<PathBuf>) -> Result<(), String> {
return Err("Another instance of the daemon is already running".to_owned());
}
- #[cfg(not(windows))]
+ #[cfg(any(target_os = "macos", target_os = "linux"))]
if let Err(err) = tokio::fs::remove_file(mullvad_paths::get_rpc_socket_path()).await {
if err.kind() != std::io::ErrorKind::NotFound {
log::error!("Failed to remove old RPC socket: {}", err);