From 3ea771fe223a8cb1adc9650591db01b82a90fd8b Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Mon, 8 May 2023 17:06:13 +0200 Subject: [PATCH] Fix crash on engine exit when asset fails to load due to serialized version mismatch --- .../Content/Loading/Tasks/LoadAssetTask.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Source/Engine/Content/Loading/Tasks/LoadAssetTask.h b/Source/Engine/Content/Loading/Tasks/LoadAssetTask.h index 911f44226..5ee384769 100644 --- a/Source/Engine/Content/Loading/Tasks/LoadAssetTask.h +++ b/Source/Engine/Content/Loading/Tasks/LoadAssetTask.h @@ -69,9 +69,24 @@ protected: return Result::Ok; } + void OnFail() override + { + if (Asset) + { + Asset->_loadingTask = nullptr; + Asset = nullptr; + } + + // Base + ContentLoadTask::OnFail(); + } void OnEnd() override { - Asset = nullptr; + if (Asset) + { + Asset->_loadingTask = nullptr; + Asset = nullptr; + } // Base ContentLoadTask::OnEnd();