From 7490f892387662bc14b77b4992fe66a9c678fb5c Mon Sep 17 00:00:00 2001 From: Hayden Leete Date: Wed, 8 Mar 2023 19:22:58 +1300 Subject: Fix crash when revealing file in floating FileSystem Dock When selecting "Show in FileSystem" from the context menu of a resource in the inspector, the engine would crash if the FileSystem dock was floating because it was trying to focus the FileSystem tab, but floating docks don't use Tab Containers. This commit makes the FileSystem dock's window grab focus instead if it's floating. (cherry picked from commit c4d1513e15e1f3e599030a98cf425177c3d1eb24) --- editor/editor_resource_picker.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/editor/editor_resource_picker.cpp b/editor/editor_resource_picker.cpp index 86ffbccefd..a83db21f20 100644 --- a/editor/editor_resource_picker.cpp +++ b/editor/editor_resource_picker.cpp @@ -399,8 +399,12 @@ void EditorResourcePicker::_edit_menu_cbk(int p_which) { file_system_dock->navigate_to_path(edited_resource->get_path()); // Ensure that the FileSystem dock is visible. - TabContainer *tab_container = (TabContainer *)file_system_dock->get_parent_control(); - tab_container->set_current_tab(tab_container->get_tab_idx_from_control(file_system_dock)); + if (file_system_dock->get_window() == get_tree()->get_root()) { + TabContainer *tab_container = (TabContainer *)file_system_dock->get_parent_control(); + tab_container->set_current_tab(tab_container->get_tab_idx_from_control(file_system_dock)); + } else { + file_system_dock->get_window()->grab_focus(); + } } break; default: { -- cgit v1.2.3