浏览代码

Merge pull request #94101 from aaronfranke/fix-editor-insp-crash

Fix editor inspector crashing when the old object is no longer valid
Rémi Verschelde 1 年之前
父节点
当前提交
69a8aed59a
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      editor/editor_inspector.cpp

+ 3 - 1
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.
 	next_object = p_object; // Some plugins need to know the next edited object when clearing the inspector.
 	if (object) {
 	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();
 		_clear();
 	}
 	}
 	per_array_page.clear();
 	per_array_page.clear();