From 6aae7d7345ff0e093ea1ef99cbe37a4b997cb2a8 Mon Sep 17 00:00:00 2001
From: Kamil Tokarski <kamil@tokarski.xyz>
Date: Thu, 4 Sep 2025 02:59:18 +0200
Subject: [PATCH] Fix editor crash cause by EditorFileSystem::get_singleton
 access in theme initialization path

---
 editor/file_system/editor_file_system.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editor/file_system/editor_file_system.cpp b/editor/file_system/editor_file_system.cpp
index d94aae02633..2617df4126a 100644
--- a/editor/file_system/editor_file_system.cpp
+++ b/editor/file_system/editor_file_system.cpp
@@ -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;