Don't edit current when changing docks

1 files changed, 4 insertions, 3 deletions

diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp
index aed1462eb6..9d75c32b73 100644
--- a/editor/editor_inspector.cpp
+++ b/editor/editor_inspector.cpp
@@ -3468,7 +3468,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) {
 		_clear();
-		object->disconnect("property_list_changed", callable_mp(this, &EditorInspector::_changed_callback));
+		if (object->is_connected("property_list_changed", callable_mp(this, &EditorInspector::_changed_callback))) {
+			object->disconnect("property_list_changed", callable_mp(this, &EditorInspector::_changed_callback));
+		}
 	}
 	per_array_page.clear();
 
@@ -4010,14 +4012,13 @@ void EditorInspector::_notification(int p_what) {
 		} break;
 
 		case NOTIFICATION_PREDELETE: {
-			edit(nullptr); //just in case
+			edit(nullptr);
 		} 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: {