Merge pull request #70580 from timothyqiu/drop-extern

Fix error when dropping script into script editor
This commit is contained in:
Rémi Verschelde 2023-01-09 09:22:08 +01:00
commit 2db593ac2f
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 7 additions and 4 deletions

View File

@ -2954,15 +2954,18 @@ void ScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data, Co
Ref<Resource> res = open_file(file); Ref<Resource> res = open_file(file);
if (res.is_valid()) { if (res.is_valid()) {
if (tab_container->get_tab_count() > num_tabs_before) { const int num_tabs = tab_container->get_tab_count();
if (num_tabs > num_tabs_before) {
tab_container->move_child(tab_container->get_tab_control(tab_container->get_tab_count() - 1), new_index); tab_container->move_child(tab_container->get_tab_control(tab_container->get_tab_count() - 1), new_index);
num_tabs_before = tab_container->get_tab_count(); num_tabs_before = num_tabs;
} else { /* Maybe script was already open */ } else if (num_tabs > 0) { /* Maybe script was already open */
tab_container->move_child(tab_container->get_tab_control(tab_container->get_current_tab()), new_index); tab_container->move_child(tab_container->get_tab_control(tab_container->get_current_tab()), new_index);
} }
} }
} }
tab_container->set_current_tab(new_index); if (tab_container->get_tab_count() > 0) {
tab_container->set_current_tab(new_index);
}
_update_script_names(); _update_script_names();
} }
} }