From 836a110c728cee39514dc8e61d50edd2ad123073 Mon Sep 17 00:00:00 2001
From: Dennis Kobert <dennis@kobert.dev>
Date: Tue, 5 Aug 2025 00:51:39 +0200
Subject: [PATCH] Fix broken animations by removing deadlock (#2993)

* Fix animations not working by removing deadlock

* Remove log
---
 .gitignore                      |  1 +
 frontend/wasm/src/editor_api.rs | 28 +++++++++++++++++++---------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index bdfa4161..3fa51804 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ target/
 *.exrc
 perf.data*
 profile.json
+profile.json.gz
 flamegraph.svg
 .idea/
 .direnv
diff --git a/frontend/wasm/src/editor_api.rs b/frontend/wasm/src/editor_api.rs
index db8dd7df..617231b7 100644
--- a/frontend/wasm/src/editor_api.rs
+++ b/frontend/wasm/src/editor_api.rs
@@ -239,7 +239,7 @@ impl EditorHandle {
 				wasm_bindgen_futures::spawn_local(poll_node_graph_evaluation());
 
 				if !EDITOR_HAS_CRASHED.load(Ordering::SeqCst) {
-					editor_and_handle(|_, handle| {
+					handle(|handle| {
 						handle.dispatch(InputPreprocessorMessage::CurrentTime {
 							timestamp: js_sys::Date::now() as u64,
 						});
@@ -914,7 +914,10 @@ fn set_timeout(f: &Closure<dyn FnMut()>, delay: Duration) {
 fn editor<T: Default>(callback: impl FnOnce(&mut editor::application::Editor) -> T) -> T {
 	EDITOR.with(|editor| {
 		let mut guard = editor.try_lock();
-		let Ok(Some(editor)) = guard.as_deref_mut() else { return T::default() };
+		let Ok(Some(editor)) = guard.as_deref_mut() else {
+			log::error!("Failed to borrow editor");
+			return T::default();
+		};
 
 		callback(editor)
 	})
@@ -922,19 +925,26 @@ fn editor<T: Default>(callback: impl FnOnce(&mut editor::application::Editor) ->
 
 /// Provides access to the `Editor` and its `EditorHandle` by calling the given closure with them as arguments.
 pub(crate) fn editor_and_handle(callback: impl FnOnce(&mut Editor, &mut EditorHandle)) {
-	EDITOR_HANDLE.with(|editor_handle| {
+	handle(|editor_handle| {
 		editor(|editor| {
-			let mut guard = editor_handle.try_lock();
-			let Ok(Some(editor_handle)) = guard.as_deref_mut() else {
-				log::error!("Failed to borrow editor handle");
-				return;
-			};
-
 			// Call the closure with the editor and its handle
 			callback(editor, editor_handle);
 		})
 	});
 }
+/// Provides access to the `EditorHandle` by calling the given closure with them as arguments.
+pub(crate) fn handle(callback: impl FnOnce(&mut EditorHandle)) {
+	EDITOR_HANDLE.with(|editor_handle| {
+		let mut guard = editor_handle.try_lock();
+		let Ok(Some(editor_handle)) = guard.as_deref_mut() else {
+			log::error!("Failed to borrow editor handle");
+			return;
+		};
+
+		// Call the closure with the editor and its handle
+		callback(editor_handle);
+	});
+}
 
 async fn poll_node_graph_evaluation() {
 	// Process no further messages after a crash to avoid spamming the console