GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash when importing assets in Editor (race-condition from Content Importer thread)

Browse Source 
#1691 #1679
This commit is contained in:
Wojtek Figat
2023-10-13 15:44:18 +02:00
parent abd6881d7b
commit 9a636468e0
3 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Editor/Modules/ContentDatabaseModule.cs
View File

@@ -1135,17 +1135,19 @@ namespace FlaxEditor.Modules
RebuildInternal();
Editor.ContentImporting.ImportFileEnd += ContentImporting_ImportFileDone;
Editor.ContentImporting.ImportFileEnd += (obj, failed) =>
{
var path = obj.ResultUrl;
if (!failed)
FlaxEngine.Scripting.InvokeOnUpdate(() => OnImportFileDone(path));
};
_enableEvents = true;
}
private void ContentImporting_ImportFileDone(IFileEntryAction obj, bool failed)
private void OnImportFileDone(string path)
{
if (failed)
return;
// Check if already has that element
var item = Find(obj.ResultUrl);
var item = Find(path);
if (item is BinaryAssetItem binaryAssetItem)
{
// Get asset info from the registry (content layer will update cache it just after import)