godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-23 15:16:17 +00:00
Code Releases Wiki Activity

Fix current-scene update

Browse Source
This commit is contained in:
Hrvoje Varga
2023-07-27 07:45:53 +02:00
parent 202e4b2c1e
commit ba2850759d
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
editor/editor_node.cpp
View File

@@ -4975,10 +4975,7 @@ void EditorNode::_save_open_scenes_to_config(Ref<ConfigFile> p_layout) {
p_layout->set_value(EDITOR_NODE_CONFIG_SECTION, "open_scenes", scenes); 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()); String currently_edited_scene_path = editor_data.get_scene_path(editor_data.get_edited_scene());
// Don't save a bad path to the config. p_layout->set_value(EDITOR_NODE_CONFIG_SECTION, "current_scene", currently_edited_scene_path);
if (!currently_edited_scene_path.is_empty()) {
p_layout->set_value(EDITOR_NODE_CONFIG_SECTION, "current_scene", currently_edited_scene_path);
}
} }
void EditorNode::save_editor_layout_delayed() { void EditorNode::save_editor_layout_delayed() {
@@ -5387,7 +5384,9 @@ void EditorNode::_load_open_scenes_from_config(Ref<ConfigFile> p_layout) {
if (p_layout->has_section_key(EDITOR_NODE_CONFIG_SECTION, "current_scene")) { 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"); String current_scene = p_layout->get_value(EDITOR_NODE_CONFIG_SECTION, "current_scene");
int current_scene_idx = scenes.find(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(); save_editor_layout_delayed();