godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #107620 from bruvzg/imp_deadlock 

Fix deadlock in `EditorFileSystem::reimport_files`.
This commit is contained in:
Thaddeus Crews 2025-06-18 18:14:02 -05:00
parent c1a746a62c 507cb47f97
commit 487af4fd6f
No known key found for this signature in database
GPG Key ID: 8C6E5FEB5FC03CCC
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
editor/editor_file_system.cpp
View File

@ -3262,11 +3262,13 @@ void EditorFileSystem::reimport_files(const Vector<String> &p_files) {
int imported_count = 0;
while (true) {
ep->step(reimport_files[imported_count].path.get_file(), from + imported_count, false);
imported_sem.wait();
do {
imported_count++;
} while (imported_sem.try_wait());
while (true) {
ep->step(reimport_files[imported_count].path.get_file(), from + imported_count, false);
if (imported_sem.try_wait()) {
imported_count++;
break;
}
}
if (imported_count == item_count) {
break;
}