asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #15498 from poke1024/fix15478

Browse source 
Don't delete edit menu too early when closing script tabs
This commit is contained in:
Rémi Verschelde 2018-01-08 20:08:04 +01:00 committed by GitHub
commit 15cb56122e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
editor/plugins/script_editor_plugin.cpp
View file

@ -514,7 +514,6 @@ void ScriptEditor::_close_tab(int p_idx, bool p_save) {
if (p_save) { if (p_save) {
apply_scripts(); apply_scripts();
} }
current->clear_edit_menu();
notify_script_close(current->get_edited_script()); notify_script_close(current->get_edited_script());
} else { } else {
EditorHelp *help = Object::cast_to<EditorHelp>(tab_container->get_child(selected)); EditorHelp *help = Object::cast_to<EditorHelp>(tab_container->get_child(selected));
@ -540,6 +539,9 @@ void ScriptEditor::_close_tab(int p_idx, bool p_save) {
} }
int idx = tab_container->get_current_tab(); int idx = tab_container->get_current_tab();
if (current) {
current->clear_edit_menu();
}
memdelete(tselected); memdelete(tselected);
if (idx >= tab_container->get_child_count()) if (idx >= tab_container->get_child_count())
idx = tab_container->get_child_count() - 1; idx = tab_container->get_child_count() - 1;