From 2ad43045a3ab97308ad93a63d2527c1e9cb165fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 23 Apr 2024 19:08:16 +0200 Subject: Revert "Don't edit current when changing docks" This reverts commit 55711b2ee849163135640cda0f00fcdcb0819af5. Fixes #91046. --- editor/editor_inspector.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'editor/editor_inspector.cpp') diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index 98feba38fd..50cc89c618 100644 --- a/editor/editor_inspector.cpp +++ b/editor/editor_inspector.cpp @@ -3477,9 +3477,7 @@ 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) { _clear(); - if (object->is_connected("property_list_changed", callable_mp(this, &EditorInspector::_changed_callback))) { - object->disconnect("property_list_changed", callable_mp(this, &EditorInspector::_changed_callback)); - } + object->disconnect("property_list_changed", callable_mp(this, &EditorInspector::_changed_callback)); } per_array_page.clear(); @@ -4021,13 +4019,14 @@ void EditorInspector::_notification(int p_what) { } break; case NOTIFICATION_PREDELETE: { - edit(nullptr); + edit(nullptr); //just in case } break; case NOTIFICATION_EXIT_TREE: { if (!sub_inspector) { get_tree()->disconnect("node_removed", callable_mp(this, &EditorInspector::_node_removed)); } + edit(nullptr); } break; case NOTIFICATION_VISIBILITY_CHANGED: { -- cgit v1.2.3