From b113602ce5ae5d9be89dcb0daa951169892c829c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20T=2E=20Listwon?= <blistwon@gmail.com>
Date: Fri, 8 Dec 2023 14:47:28 +0100
Subject: [PATCH] Prevent overriding file info of another file when reimport
 creates files

(cherry picked from commit aae48ac2b688a360b80ff06105190b1842644cb5)
---
 editor/editor_file_system.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp
index c3f176b4246..48e16df0f5f 100644
--- a/editor/editor_file_system.cpp
+++ b/editor/editor_file_system.cpp
@@ -2148,6 +2148,9 @@ Error EditorFileSystem::_reimport_file(const String &p_file, const HashMap<Strin
 		}
 	}
 
+	// Update cpos, newly created files could've changed the index of the reimported p_file.
+	_find_file(p_file, &fs, cpos);
+
 	//update modified times, to avoid reimport
 	fs->files[cpos]->modified_time = FileAccess::get_modified_time(p_file);
 	fs->files[cpos]->import_modified_time = FileAccess::get_modified_time(p_file + ".import");