From 42b14ce18628da7ce2e62d29ad08b91a83890585 Mon Sep 17 00:00:00 2001
From: Frank Becker <fb@mooflu.com>
Date: Sat, 24 Jan 2026 15:22:08 -0800
Subject: [PATCH] Don't log error if there is no selection upon handling
 item_icon_double_clicked signal

---
 editor/docks/scene_tree_dock.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/editor/docks/scene_tree_dock.cpp b/editor/docks/scene_tree_dock.cpp
index 37c5a934c3..1e1075241e 100644
--- a/editor/docks/scene_tree_dock.cpp
+++ b/editor/docks/scene_tree_dock.cpp
@@ -4199,7 +4199,10 @@ void SceneTreeDock::save_branch_to_file(const String &p_directory) {
 
 void SceneTreeDock::_focus_node() {
 	Node *node = scene_tree->get_selected();
-	ERR_FAIL_NULL(node);
+	// This method handles the item_icon_double_clicked signal and there is no guarantee anything is actually selected.
+	if (!node) {
+		return;
+	}
 
 	if (node->is_class("CanvasItem")) {
 		CanvasItemEditorPlugin *editor = Object::cast_to<CanvasItemEditorPlugin>(editor_data->get_editor_by_name("2D"));