From ba2850759d37e6b4f9ba68e0b8e9382b9c3ddf85 Mon Sep 17 00:00:00 2001 From: Hrvoje Varga Date: Thu, 27 Jul 2023 07:45:53 +0200 Subject: [PATCH] Fix current-scene update --- editor/editor_node.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index b81d4aac88f7..773b8cc0022a 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -4975,10 +4975,7 @@ void EditorNode::_save_open_scenes_to_config(Ref p_layout) { p_layout->set_value(EDITOR_NODE_CONFIG_SECTION, "open_scenes", scenes); String currently_edited_scene_path = editor_data.get_scene_path(editor_data.get_edited_scene()); - // Don't save a bad path to the config. - if (!currently_edited_scene_path.is_empty()) { - p_layout->set_value(EDITOR_NODE_CONFIG_SECTION, "current_scene", currently_edited_scene_path); - } + p_layout->set_value(EDITOR_NODE_CONFIG_SECTION, "current_scene", currently_edited_scene_path); } void EditorNode::save_editor_layout_delayed() { @@ -5387,7 +5384,9 @@ void EditorNode::_load_open_scenes_from_config(Ref p_layout) { if (p_layout->has_section_key(EDITOR_NODE_CONFIG_SECTION, "current_scene")) { String current_scene = p_layout->get_value(EDITOR_NODE_CONFIG_SECTION, "current_scene"); int current_scene_idx = scenes.find(current_scene); - set_current_scene(current_scene_idx); + if (current_scene_idx >= 0) { + set_current_scene(current_scene_idx); + } } save_editor_layout_delayed();