godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #97028 from Hilderin/fix-error-reopening-non-existing-scene-on-startup 

Fix error reopening non existing scene on startup
This commit is contained in:
Rémi Verschelde 2024-09-17 09:17:57 +02:00
parent b1b4d5b6d1 d06c7ad6f0
commit 6bd833d2b8
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
editor/editor_node.cpp
View File

@ -5341,14 +5341,18 @@ void EditorNode::_load_open_scenes_from_config(Ref<ConfigFile> p_layout) {
PackedStringArray scenes = p_layout->get_value(EDITOR_NODE_CONFIG_SECTION, "open_scenes"); PackedStringArray scenes = p_layout->get_value(EDITOR_NODE_CONFIG_SECTION, "open_scenes");
for (int i = 0; i < scenes.size(); i++) { for (int i = 0; i < scenes.size(); i++) {
if (FileAccess::exists(scenes[i])) {
load_scene(scenes[i]); load_scene(scenes[i]);
} }
}
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); for (int i = 0; i < editor_data.get_edited_scene_count(); i++) {
if (current_scene_idx >= 0) { if (editor_data.get_scene_path(i) == current_scene) {
_set_current_scene(current_scene_idx); _set_current_scene(i);
break;
}
} }
} }