From 6c94b2cb9e9f6293b7637d2e714036d2352f33d9 Mon Sep 17 00:00:00 2001 From: Lyuma Date: Thu, 17 Jun 2021 05:30:24 -0700 Subject: [PATCH] Remove thread-unsafe and unused late_added_files. _reimport_file is called from multiple threads as part of the threaded importer. Inserting to this set from a thread could hit a race condition leading to memory corruption or hangs. It seems to be unused, intentionally or unintentionally --- editor/editor_file_system.cpp | 5 ----- editor/editor_file_system.h | 1 - 2 files changed, 6 deletions(-) diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp index c61b097ccda..3f715c1f93d 100644 --- a/editor/editor_file_system.cpp +++ b/editor/editor_file_system.cpp @@ -1475,8 +1475,6 @@ void EditorFileSystem::update_file(const String &p_file) { if (cpos == -1) { // The file did not exist, it was added. - - late_added_files.insert(p_file); // Remember that it was added. This mean it will be scanned and imported on editor restart. int idx = 0; String file_name = p_file.get_file(); @@ -1723,9 +1721,6 @@ void EditorFileSystem::_reimport_file(const String &p_file, const Map late_added_files; //keep track of files that were added, these will be re-scanned Set late_update_files; void _save_late_updated_files();