Browse Source

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
Lyuma 4 years ago
parent
commit
6c94b2cb9e
2 changed files with 0 additions and 6 deletions
  1. 0 5
      editor/editor_file_system.cpp
  2. 0 1
      editor/editor_file_system.h

+ 0 - 5
editor/editor_file_system.cpp

@@ -1475,8 +1475,6 @@ void EditorFileSystem::update_file(const String &p_file) {
 
 
 	if (cpos == -1) {
 	if (cpos == -1) {
 		// The file did not exist, it was added.
 		// 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;
 		int idx = 0;
 		String file_name = p_file.get_file();
 		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") {
 	if (importer_name == "keep") {

+ 0 - 1
editor/editor_file_system.h

@@ -148,7 +148,6 @@ class EditorFileSystem : public Node {
 
 
 	void _scan_filesystem();
 	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;
 	Set<String> late_update_files;
 
 
 	void _save_late_updated_files();
 	void _save_late_updated_files();