summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLyuma <xn.lyuma@gmail.com>2021-06-17 05:30:24 -0700
committerLyuma <xn.lyuma@gmail.com>2021-06-17 05:30:24 -0700
commit6c94b2cb9e9f6293b7637d2e714036d2352f33d9 (patch)
treecce813094697b74d0a459513be70be58b2366a43
parentdd39855c0a19f2d9a9c76b2f8b204e96d94d31e3 (diff)
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
-rw-r--r--editor/editor_file_system.cpp5
-rw-r--r--editor/editor_file_system.h1
2 files changed, 0 insertions, 6 deletions
diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp
index c61b097ccd..3f715c1f93 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<StringName
}
}
}
-
- } else {
- late_added_files.insert(p_file); //imported files do not call update_file(), but just in case..
}
if (importer_name == "keep") {
diff --git a/editor/editor_file_system.h b/editor/editor_file_system.h
index 04879bad6d..37eee13c16 100644
--- a/editor/editor_file_system.h
+++ b/editor/editor_file_system.h
@@ -148,7 +148,6 @@ class EditorFileSystem : public Node {
void _scan_filesystem();
- Set<String> late_added_files; //keep track of files that were added, these will be re-scanned
Set<String> late_update_files;
void _save_late_updated_files();