Merge pull request #110242 from ktxyz/fix-crash-theme-and-another-project

Fix editor crash caused by EditorFileSystem::get_singleton access in theme initialization path
This commit is contained in:
Thaddeus Crews 2025-09-22 08:50:00 -05:00
commit 3ef19961cc
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC

View file

@ -3442,7 +3442,7 @@ bool EditorFileSystem::_should_skip_directory(const String &p_path) {
if (FileAccess::exists(p_path.path_join("project.godot"))) {
// Skip if another project inside this.
if (EditorFileSystem::get_singleton()->first_scan) {
if (EditorFileSystem::get_singleton() == nullptr || EditorFileSystem::get_singleton()->first_scan) {
WARN_PRINT_ONCE(vformat("Detected another project.godot at %s. The folder will be ignored.", p_path));
}
return true;