From aa4de7642392408348db4e1418868f35f40ee394 Mon Sep 17 00:00:00 2001 From: "gcp-cherry-pick-bot[bot]" <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 11:20:54 -0600 Subject: [PATCH] Defer first update active buffer for conversation (cherry-pick #10564) (#10566) Cherry-picked Defer first update active buffer for conversation (#10564) This fixes when the workspace is not actually available for a `.read(cx)`. Release Notes: - Fix a panic when quoting a selection before the assistant panel has been started Co-authored-by: Conrad Irwin Co-authored-by: Kyle Kelley Co-authored-by: Conrad Irwin --- crates/assistant/src/assistant_panel.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/assistant/src/assistant_panel.rs b/crates/assistant/src/assistant_panel.rs index 435388cf817fbef20d7729434f660dcae3608af8..346f718eb853e2dc17f9db0272749936391a28e5 100644 --- a/crates/assistant/src/assistant_panel.rs +++ b/crates/assistant/src/assistant_panel.rs @@ -2064,7 +2064,7 @@ impl ConversationEditor { workspace: workspace.downgrade(), _subscriptions, }; - this.update_active_buffer(workspace, cx); + cx.defer(|this, cx| this.update_active_buffer(workspace, cx)); this.update_message_headers(cx); this }