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

Merge pull request #21878 from RyanStein/bugfix-14400

Browse source 
Make `_sort_list_on_update` true before opening files, fixes 14400
This commit is contained in:
Rémi Verschelde 2018-09-12 11:18:10 +02:00 committed by GitHub
commit c7fc3dcab3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
editor/plugins/script_editor_plugin.cpp
View file

@ -1800,8 +1800,8 @@ void ScriptEditor::_update_script_names() {
new_cur_tab = i; new_cur_tab = i;
} }
} }
tab_container->call_deferred("set_current_tab", new_prev_tab); tab_container->set_current_tab(new_prev_tab);
tab_container->call_deferred("set_current_tab", new_cur_tab); tab_container->set_current_tab(new_cur_tab);
_sort_list_on_update = false; _sort_list_on_update = false;
} }
@ -2024,6 +2024,7 @@ bool ScriptEditor::edit(const RES &p_resource, int p_line, int p_col, bool p_gra
_go_to_tab(tab_container->get_tab_count() - 1); _go_to_tab(tab_container->get_tab_count() - 1);
} }
_sort_list_on_update = true;
_update_script_names(); _update_script_names();
_save_layout(); _save_layout();
se->connect("name_changed", this, "_update_script_names"); se->connect("name_changed", this, "_update_script_names");
@ -2598,6 +2599,7 @@ void ScriptEditor::_help_class_open(const String &p_class) {
eh->go_to_class(p_class, 0); eh->go_to_class(p_class, 0);
eh->connect("go_to_help", this, "_help_class_goto"); eh->connect("go_to_help", this, "_help_class_goto");
_add_recent_script(p_class); _add_recent_script(p_class);
_sort_list_on_update = true;
_update_script_names(); _update_script_names();
_save_layout(); _save_layout();
} }
@ -2627,6 +2629,7 @@ void ScriptEditor::_help_class_goto(const String &p_desc) {
eh->go_to_help(p_desc); eh->go_to_help(p_desc);
eh->connect("go_to_help", this, "_help_class_goto"); eh->connect("go_to_help", this, "_help_class_goto");
_add_recent_script(eh->get_class()); _add_recent_script(eh->get_class());
_sort_list_on_update = true;
_update_script_names(); _update_script_names();
_save_layout(); _save_layout();
} }