diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-04-22 12:53:00 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-04-22 12:53:00 +0200 |
| commit | 8ab5ab19c32312253557c080eaf63c3e26758807 (patch) | |
| tree | 81ce66e13702c70c3a7d6cf4c205f1c7121a679f | |
| parent | 6cf03a5bbbec48f395c6f61fb33f14e25d0a82a3 (diff) | |
| parent | 55711b2ee849163135640cda0f00fcdcb0819af5 (diff) | |
| download | redot-engine-8ab5ab19c32312253557c080eaf63c3e26758807.tar.gz | |
Merge pull request #90816 from kitbdev/dock-dont-edit-current
Don't edit current when changing docks
| -rw-r--r-- | editor/editor_dock_manager.cpp | 1 | ||||
| -rw-r--r-- | editor/editor_inspector.cpp | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/editor/editor_dock_manager.cpp b/editor/editor_dock_manager.cpp index b6250671ee..06dd33d8ab 100644 --- a/editor/editor_dock_manager.cpp +++ b/editor/editor_dock_manager.cpp @@ -147,7 +147,6 @@ void EditorDockManager::_update_layout() { if (!dock_context_popup->is_inside_tree() || EditorNode::get_singleton()->is_exiting()) { return; } - EditorNode::get_singleton()->edit_current(); dock_context_popup->docks_updated(); _update_docks_menu(); EditorNode::get_singleton()->save_editor_layout_delayed(); diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index 50cc89c618..98feba38fd 100644 --- a/editor/editor_inspector.cpp +++ b/editor/editor_inspector.cpp @@ -3477,7 +3477,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(); @@ -4019,14 +4021,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: { |