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

Merge pull request #28351 from Paulb23/fix_state_crash

Browse source 
Fix crash when restoring script editor state
This commit is contained in:
Rémi Verschelde 2019-04-23 23:23:32 +02:00 committed by GitHub
commit 80f91c9d36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
editor/plugins/script_editor_plugin.cpp
View file

@ -2507,19 +2507,25 @@ void ScriptEditor::set_window_layout(Ref<ConfigFile> p_layout) {
if (!scr.is_valid()) { if (!scr.is_valid()) {
continue; continue;
} }
edit(scr); if (!edit(scr)) {
continue;
}
} else { } else {
Error error; Error error;
Ref<TextFile> text_file = _load_text_file(path, &error); Ref<TextFile> text_file = _load_text_file(path, &error);
if (error != OK || !text_file.is_valid()) { if (error != OK || !text_file.is_valid()) {
continue; continue;
} }
edit(text_file); if (!edit(text_file)) {
continue;
}
} }
if (!script_info.empty()) { if (!script_info.empty()) {
ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_child(i)); ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_child(tab_container->get_tab_count() - 1));
se->set_edit_state(script_info["state"]); if (se) {
se->set_edit_state(script_info["state"]);
}
} }
} }