Don't edit current when changing docks v2

godotengine · Apr 25, 2024 · eefd311 · eefd311
1 parent 11d3768
commit eefd311
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -4019,14 +4019,16 @@ void EditorInspector::_notification(int p_what) {
  } break;
 
  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;
 
  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: {