Move deadline to separate select-arm

mullvad · Dec 13, 2024 · df24377 · df24377
1 parent 87669a9
commit df24377
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/talpid-core/src/split_tunnel/macos/process.rs b/talpid-core/src/split_tunnel/macos/process.rs
@@ -155,21 +155,23 @@ async fn parse_logger_status(
         }
     });
 
-    let proc = tokio::time::timeout(EARLY_FAIL_TIMEOUT, proc);
+    let deadline = tokio::time::sleep(EARLY_FAIL_TIMEOUT);
 
     tokio::select! {
         // Received standard err/out
         biased; need_full_disk_access = &mut need_full_disk_access => {
             need_full_disk_access.unwrap_or(NeedFda::No)
         }
         proc_result = proc => {
-            if let Ok(Ok(_exit_status)) = proc_result {
+            if let Ok(_exit_status) = proc_result {
                 // Process exited
                 return need_full_disk_access.await.unwrap_or(NeedFda::No);
             }
-            // Timeout or `Child::wait`` returned an error
+            // `Child::wait`` returned an error
             NeedFda::No
         }
+        // Timed out while checking for full-disk access
+        _ = deadline => NeedFda::No,
     }
 }