godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15498 from poke1024/fix15478 

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
parent 299e490cf4 7e1b39245f
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) {
apply_scripts();
}
current->clear_edit_menu();
notify_script_close(current->get_edited_script());
} else {
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();
if (current) {
current->clear_edit_menu();
}
memdelete(tselected);
if (idx >= tab_container->get_child_count())
idx = tab_container->get_child_count() - 1;