diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index 5d81ade214d..03287b8cf9c 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -2507,19 +2507,25 @@ void ScriptEditor::set_window_layout(Ref p_layout) { if (!scr.is_valid()) { continue; } - edit(scr); + if (!edit(scr)) { + continue; + } } else { Error error; Ref text_file = _load_text_file(path, &error); if (error != OK || !text_file.is_valid()) { continue; } - edit(text_file); + if (!edit(text_file)) { + continue; + } } if (!script_info.empty()) { - ScriptEditorBase *se = Object::cast_to(tab_container->get_child(i)); - se->set_edit_state(script_info["state"]); + ScriptEditorBase *se = Object::cast_to(tab_container->get_child(tab_container->get_tab_count() - 1)); + if (se) { + se->set_edit_state(script_info["state"]); + } } }