From d4ae5e83e5c2cc6c6490199c64d3d82280e78fdc Mon Sep 17 00:00:00 2001
From: John Carmack <johncarmack@me.com>
Date: Wed, 13 Nov 2024 07:01:36 -0800
Subject: [PATCH] Add check for nested runtime to run_async_command

---
 plugins/sql/src/lib.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/sql/src/lib.rs b/plugins/sql/src/lib.rs
index adcb3a72..c310df29 100644
--- a/plugins/sql/src/lib.rs
+++ b/plugins/sql/src/lib.rs
@@ -106,7 +106,11 @@ impl MigrationSource<'static> for MigrationList {
 
 /// Allows blocking on async code without creating a nested runtime.
 fn run_async_command<F: std::future::Future>(cmd: F) -> F::Output {
-    tokio::task::block_in_place(|| tokio::runtime::Handle::current().block_on(cmd))
+    if tokio::runtime::Handle::try_current().is_ok() {
+        tokio::task::block_in_place(|| tokio::runtime::Handle::current().block_on(cmd))
+    } else {
+        tauri::async_runtime::block_on(cmd)
+    }
 }
 
 /// Tauri SQL plugin builder.