godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't edit current when changing docks v2

Browse Source
This commit is contained in:
kit 2024-04-23 15:07:34 -04:00
parent 11d3768132
commit eefd311456
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editor/editor_dock_manager.cpp
View File

@ -147,7 +147,6 @@ void EditorDockManager::_update_layout() {
if (!dock_context_popup->is_inside_tree() || EditorNode::get_singleton()->is_exiting()) { if (!dock_context_popup->is_inside_tree() || EditorNode::get_singleton()->is_exiting()) {
return; return;
} }
EditorNode::get_singleton()->edit_current();
dock_context_popup->docks_updated(); dock_context_popup->docks_updated();
_update_docks_menu(); _update_docks_menu();
EditorNode::get_singleton()->save_editor_layout_delayed(); EditorNode::get_singleton()->save_editor_layout_delayed();

6
editor/editor_inspector.cpp
View File

@ -4019,14 +4019,16 @@ void EditorInspector::_notification(int p_what) {
} break; } break;
case NOTIFICATION_PREDELETE: { case NOTIFICATION_PREDELETE: {
edit(nullptr); //just in case if (EditorNode::get_singleton() && !EditorNode::get_singleton()->is_exiting()) {
// Don't need to clean up if exiting, and object may already be freed.
edit(nullptr);
}
} break; } break;
case NOTIFICATION_EXIT_TREE: { case NOTIFICATION_EXIT_TREE: {
if (!sub_inspector) { if (!sub_inspector) {
get_tree()->disconnect("node_removed", callable_mp(this, &EditorInspector::_node_removed)); get_tree()->disconnect("node_removed", callable_mp(this, &EditorInspector::_node_removed));
} }
edit(nullptr);
} break; } break;
case NOTIFICATION_VISIBILITY_CHANGED: { case NOTIFICATION_VISIBILITY_CHANGED: {