From 83a78186ca002154b4c54f78a8f6af5595cd8d0c Mon Sep 17 00:00:00 2001
From: Artemy Fedotov <catlovescpp@gmail.com>
Date: Thu, 11 Sep 2025 14:25:49 +0400
Subject: [PATCH] Fix crash due to null pointer dereference when
 moving/renaming folders in `FileSystemDock`

(cherry picked from commit 4e3a39a2e816272b4b29fc7f9d807d6e34b2100e)
---
 editor/docks/filesystem_dock.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/editor/docks/filesystem_dock.cpp b/editor/docks/filesystem_dock.cpp
index 529786c5e70..e455102fa70 100644
--- a/editor/docks/filesystem_dock.cpp
+++ b/editor/docks/filesystem_dock.cpp
@@ -2033,6 +2033,7 @@ void FileSystemDock::_before_move(HashMap<String, ResourceUID::ID> &r_uids, Hash
 			}
 		} else {
 			EditorFileSystemDirectory *current_folder = EditorFileSystem::get_singleton()->get_filesystem_path(to_move[i].path);
+			ERR_CONTINUE(current_folder == nullptr);
 			List<EditorFileSystemDirectory *> folders;
 			folders.push_back(current_folder);
 			while (folders.front()) {