Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix asset file race

Browse Source 
https://github.com/RomanZhu/FlaxEngine/commit/71bad36469bc6cdd31384f429bdc05c251e0eb91
This commit is contained in:
Roman Zhu
2026-08-30 22:13:27 +02:00
committed by Wojtek Figat
parent ac4737a4d5
commit c393db6fdc
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Engine/Content/Storage/FlaxStorage.cpp
+7 -5
View File
@@ -1438,10 +1438,6 @@ FileReadStream* FlaxStorage::OpenFile()
bool FlaxStorage::CloseFileHandles()
{
// Guard the whole process so if new thread wants to lock the chunks will need to wait for this to end
Platform::InterlockedIncrement(&_isUnloadingData);
SCOPE_EXIT{ Platform::InterlockedDecrement(&_isUnloadingData); };
if (Platform::AtomicRead(&_chunksLock) == 0 && Platform::AtomicRead(&_files) == 0)
return false; // Early out when no files are opened
PROFILE_CPU();
@@ -1469,7 +1465,13 @@ bool FlaxStorage::CloseFileHandles()
}
}
}
waitTime = 100;
// Guard the whole process so if new thread wants to lock the chunks will need to wait for this to end
Platform::InterlockedIncrement(&_isUnloadingData);
SCOPE_EXIT{ Platform::InterlockedDecrement(&_isUnloadingData); };
// Wait for chunks lock again (with larger timeout for longer tasks)
waitTime = 1000;
while (Platform::AtomicRead(&_chunksLock) != 0 && waitTime-- > 0)
Platform::Sleep(1);
if (Platform::AtomicRead(&_chunksLock) != 0)