fix: occasional use-after-disposed panic in Suspense

leptos-rs · Feb 12, 2025 · 620a14c · 620a14c
1 parent 7be6a9d
commit 620a14c
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/leptos/src/suspense_component.rs b/leptos/src/suspense_component.rs
@@ -303,11 +303,13 @@ where
         let eff = reactive_graph::effect::Effect::new_isomorphic({
             move |_| {
                 tasks.track();
-                if tasks.read().is_empty() {
-                    if let Some(tx) = tasks_tx.take() {
-                        // If the receiver has dropped, it means the ScopedFuture has already
-                        // dropped, so it doesn't matter if we manage to send this.
-                        _ = tx.send(());
+                if let Some(tasks) = tasks.try_read() {
+                    if tasks.is_empty() {
+                        if let Some(tx) = tasks_tx.take() {
+                            // If the receiver has dropped, it means the ScopedFuture has already
+                            // dropped, so it doesn't matter if we manage to send this.
+                            _ = tx.send(());
+                        }
                     }
                 }
             }