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

Merge pull request #11356 from Paulb23/text_editor_theme_crash

Browse source 
Fixed segfault on loading text editor theme

[ci skip]
This commit is contained in:
Rémi Verschelde 2017-09-17 17:57:00 +02:00 • committed by GitHub
commit 4208518c4d
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
editor/plugins/script_editor_plugin.cpp
View file

@ -1682,9 +1682,10 @@ bool ScriptEditor::edit(const Ref<Script> &p_script, int p_line, int p_col, bool
break;
}
ERR_FAIL_COND_V(!se, false);
tab_container->add_child(se);
// load script before adding as child else editor will crash at theme loading
se->set_edited_script(p_script);
tab_container->add_child(se);
se->set_tooltip_request_func("_get_debug_tooltip", this);
if (se->get_edit_menu()) {
se->get_edit_menu()->hide();