From 2e7526af42a265e83f511eeff1e4a2cc70bd3624 Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Mon, 8 Jul 2024 14:00:28 -0700 Subject: [PATCH] Fix editor inspector crashing when the old object is no longer valid --- editor/editor_inspector.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index 467a19ebb141..199383c3918b 100644 --- a/editor/editor_inspector.cpp +++ b/editor/editor_inspector.cpp @@ -3579,7 +3579,9 @@ void EditorInspector::edit(Object *p_object) { next_object = p_object; // Some plugins need to know the next edited object when clearing the inspector. if (object) { - object->disconnect(CoreStringName(property_list_changed), callable_mp(this, &EditorInspector::_changed_callback)); + if (likely(Variant(object).get_validated_object())) { + object->disconnect(CoreStringName(property_list_changed), callable_mp(this, &EditorInspector::_changed_callback)); + } _clear(); } per_array_page.clear();