From 196586e3528ca03e6acacd44342126b85115f349 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Mon, 12 May 2025 14:50:25 +0200 Subject: [PATCH] Fix deadlock loading node from the command line (#30561) Before this change the the load env task never completed, leading to the node runtime lock being held permanently. Release Notes: - N/A --- crates/zed/src/main.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs index 946aa81a22..dac531133b 100644 --- a/crates/zed/src/main.rs +++ b/crates/zed/src/main.rs @@ -309,6 +309,8 @@ fn main() { shell_env_loaded_tx.send(()).ok(); }) .detach() + } else { + drop(shell_env_loaded_tx) } app.on_open_urls({