fix(core): safe_block_on usage on async contexts, closes #3505 (#3513)

tauri-apps · Feb 24, 2022 · 0163489 · 0163489
1 parent 944b124
commit 0163489
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.changes/fix-safe-block-on.md b/.changes/fix-safe-block-on.md
@@ -0,0 +1,5 @@
+---
+"tauri": patch
+---
+
+Fixes `Command::output` and `Command::status` deadlock when running on async commands.
diff --git a/core/tauri/src/async_runtime.rs b/core/tauri/src/async_runtime.rs
@@ -285,10 +285,11 @@ where
   F: Future + Send + 'static,
   F::Output: Send + 'static,
 {
-  if tokio::runtime::Handle::try_current().is_ok() {
+  if let Ok(handle) = tokio::runtime::Handle::try_current() {
     let (tx, rx) = std::sync::mpsc::sync_channel(1);
-    spawn(async move {
-      tx.send(task.await).unwrap();
+    let handle_ = handle.clone();
+    handle.spawn_blocking(move || {
+      tx.send(handle_.block_on(task)).unwrap();
     });
     rx.recv().unwrap()
   } else {