Merge branch 'dev' of github.com:hxhb/HotPatcher into dev

zero16832 · Aug 21, 2022 · 49f8bcc · 49f8bcc
2 parents 39bc120 + 9fe5569
commit 49f8bcc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/HotPatcher/Source/HotPatcherCore/Private/FlibHotPatcherCoreHelper.cpp b/HotPatcher/Source/HotPatcherCore/Private/FlibHotPatcherCoreHelper.cpp
@@ -2419,7 +2419,11 @@ bool UFlibHotPatcherCoreHelper::SerializeChunksManifests(ITargetPlatform* Target
 {
 	bool bresult = true;
 #if GENERATE_CHUNKS_MANIFEST
+#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 26
 	TUniquePtr<class FSandboxPlatformFile> TempSandboxFile = MakeUnique<FSandboxPlatformFile>(false);
+#else
+	TUniquePtr<class FSandboxPlatformFile> TempSandboxFile = FSandboxPlatformFile::Create(false);
+#endif
 	FString PlatformSandboxDir = FPaths::ConvertRelativePathToFull(FPaths::Combine(FPaths::ProjectSavedDir(),TEXT("Cooked"),TargetPlatform->PlatformName()));
 	// Use SandboxFile to do path conversion to properly handle sandbox paths (outside of standard paths in particular).
 	TempSandboxFile->Initialize(&FPlatformFileManager::Get().GetPlatformFile(), *FString::Printf(TEXT("-sandbox=\"%s\""), *PlatformSandboxDir));

diff --git a/HotPatcher/Source/HotPatcherRuntime/Private/FlibAssetManageHelper.cpp b/HotPatcher/Source/HotPatcherRuntime/Private/FlibAssetManageHelper.cpp
@@ -337,7 +337,7 @@ bool UFlibAssetManageHelper::IsRedirector(const FAssetDetail& Src,FAssetDetail&
 	FAssetData AssetData;
 	if (UFlibAssetManageHelper::GetSingleAssetsData(Src.PackagePath.ToString(), AssetData))
 	{
-		if (AssetData.IsValid() && AssetData.IsRedirector() ||
+		if ((AssetData.IsValid() && AssetData.IsRedirector()) ||
 			UObjectRedirector::StaticClass()->GetFName() == Src.AssetType ||
 			Src.PackagePath != AssetData.ObjectPath
 			)