diff options
| author | Yuri Sizov <11782833+YuriSizov@users.noreply.github.com> | 2023-03-08 15:04:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-08 15:04:00 +0100 |
| commit | 9b9bb418cb1137e69b5131ec9fa7b41c0396db28 (patch) | |
| tree | 29d7ef21d21074e04afe446f606a8fb9c8de1f16 | |
| parent | bed6c1dc4913b7137ba5dca814544c58f8dd34e0 (diff) | |
| parent | c4d1513e15e1f3e599030a98cf425177c3d1eb24 (diff) | |
| download | redot-engine-9b9bb418cb1137e69b5131ec9fa7b41c0396db28.tar.gz | |
Merge pull request #74591 from Haydoggo/floating-file-dock-crash-fix
fix crash when showing file in FileSytem dock
| -rw-r--r-- | editor/editor_resource_picker.cpp | 8 |
1 files 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: { |