From 2dc9fdf5d48430f644ae8333dffbd6dcd4883577 Mon Sep 17 00:00:00 2001
From: Miguel de Icaza <miguel@gnome.org>
Date: Sun, 26 Apr 2026 16:46:35 -0400
Subject: [PATCH] This fixes a regression in the Skeleton3D editor that was
 introduced by previous fix for a crash in the editor in
 https://github.com/godotengine/godot/pull/113631

This preserves the nature of the original fix, and also stops receiving events
the moment that it is no longer needed (addressing the ONE_SHOT difference).
---
 editor/scene/3d/skeleton_3d_editor_plugin.cpp | 40 ++++++++++++++-----
 editor/scene/3d/skeleton_3d_editor_plugin.h   |  1 +
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/editor/scene/3d/skeleton_3d_editor_plugin.cpp b/editor/scene/3d/skeleton_3d_editor_plugin.cpp
index 342b0bee28..a7bc4c3cb2 100644
--- a/editor/scene/3d/skeleton_3d_editor_plugin.cpp
+++ b/editor/scene/3d/skeleton_3d_editor_plugin.cpp
@@ -975,6 +975,9 @@ void Skeleton3DEditor::_update_properties() {
 	if (pose_editor) {
 		pose_editor->_update_properties();
 	}
+	if (!skeleton || !skeleton->is_inside_tree()) {
+		return;
+	}
 	Node3DEditor::get_singleton()->update_transform_gizmo();
 }
 
@@ -1265,6 +1268,7 @@ void Skeleton3DEditor::_notification(int p_what) {
 			update_joint_tree();
 		} break;
 		case NOTIFICATION_PREDELETE: {
+			_disconnect_from_tree();
 			if (skeleton) {
 				select_bone(-1); // Requires that the joint_tree has not been deleted.
 				_disconnect_from_skeleton();
@@ -1280,17 +1284,20 @@ void Skeleton3DEditor::_notification(int p_what) {
 }
 
 void Skeleton3DEditor::_node_removed(Node *p_node) {
-	if (skeleton && p_node == skeleton) {
-		_disconnect_from_skeleton();
-		if (pose_editor) {
-			pose_editor->set_skeleton(nullptr);
-			pose_editor->set_visible(false);
-		}
-		edit_mode = false;
-		skeleton = nullptr;
-		skeleton_options->hide();
+	if (!skeleton || p_node != skeleton) {
+		return;
 	}
 
+	_disconnect_from_tree();
+	_disconnect_from_skeleton();
+	if (pose_editor) {
+		pose_editor->set_skeleton(nullptr);
+		pose_editor->set_visible(false);
+	}
+	edit_mode = false;
+	skeleton = nullptr;
+	skeleton_options->hide();
+
 	_update_properties();
 }
 
@@ -1313,6 +1320,21 @@ void Skeleton3DEditor::_disconnect_from_skeleton() {
 	}
 }
 
+void Skeleton3DEditor::_disconnect_from_tree() {
+	if (!is_inside_tree()) {
+		return;
+	}
+
+	SceneTree *tree = get_tree();
+	if (!tree) {
+		return;
+	}
+
+	if (tree->is_connected("node_removed", callable_mp(this, &Skeleton3DEditor::_node_removed))) {
+		tree->disconnect("node_removed", callable_mp(this, &Skeleton3DEditor::_node_removed));
+	}
+}
+
 void Skeleton3DEditor::edit_mode_toggled(const bool pressed) {
 	edit_mode = pressed;
 	_update_gizmo_visible();
diff --git a/editor/scene/3d/skeleton_3d_editor_plugin.h b/editor/scene/3d/skeleton_3d_editor_plugin.h
index 4a27c12017..01a7431629 100644
--- a/editor/scene/3d/skeleton_3d_editor_plugin.h
+++ b/editor/scene/3d/skeleton_3d_editor_plugin.h
@@ -220,6 +220,7 @@ class Skeleton3DEditor : public VBoxContainer {
 
 	void _subgizmo_selection_change();
 	void _disconnect_from_skeleton();
+	void _disconnect_from_tree();
 
 	int selected_bone = -1;