diff --git a/Source/Engine/Content/Asset.cpp b/Source/Engine/Content/Asset.cpp index aa6305aa2..c6175c9fb 100644 --- a/Source/Engine/Content/Asset.cpp +++ b/Source/Engine/Content/Asset.cpp @@ -57,14 +57,14 @@ void AssetReferenceBase::OnSet(Asset* asset) void AssetReferenceBase::OnLoaded(Asset* asset) { - if (_asset != asset) + if (this == nullptr || _asset != asset) return; Loaded(); } void AssetReferenceBase::OnUnloaded(Asset* asset) { - if (_asset != asset) + if (this == nullptr || _asset != asset) return; Unload(); OnSet(nullptr);