Fix issue #26: assertion failed at serializing asset registry when in…

…cluding redirectors (cherry picked from commit 9bcc6f2)
hxhb · Jan 28, 2022 · 70c5745 · 70c5745
1 parent f67cd66
commit 70c5745
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/HotPatcher/Source/HotPatcherCore/Private/FlibHotPatcherCoreHelper.cpp b/HotPatcher/Source/HotPatcherCore/Private/FlibHotPatcherCoreHelper.cpp
@@ -1391,14 +1391,20 @@ bool UFlibHotPatcherCoreHelper::SerializeAssetRegistry(const FString& PlatformNa
 	AssetRegistry.InitializeTemporaryAssetRegistryState(State, SaveOptions, true);
 	for(const auto& AssetPackagePath:PackagePaths)
 	{
-		if(State.GetAssetByObjectPath(FName(*AssetPackagePath)))
+		if (State.GetAssetByObjectPath(FName(*AssetPackagePath)))
 		{
-			UE_LOG(LogHotPatcherCoreHelper,Warning,TEXT("%s Alway add to AssetRegistryState!"),*AssetPackagePath);
+			UE_LOG(LogHotPatcherCoreHelper, Warning, TEXT("%s already add to AssetRegistryState!"), *AssetPackagePath);
 			continue;
 		}
 		FAssetData* AssetData = new FAssetData();
-		if(UFlibAssetManageHelper::GetSingleAssetsData(AssetPackagePath,*AssetData))
+		if (UFlibAssetManageHelper::GetSingleAssetsData(AssetPackagePath, *AssetData))
 		{
+			if (AssetPackagePath != AssetData->ObjectPath.ToString())
+			{
+				UE_LOG(LogHotPatcherCoreHelper, Warning, TEXT("%s is a redirector of %s, skip!"), *AssetPackagePath, *AssetData->ObjectPath.ToString());
+				delete AssetData;
+				continue;
+			}
 			State.AddAssetData(AssetData);
 			continue;
 		}