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

Fix saving assets with path containing invalid slashes

Browse Source
This commit is contained in:
Wojtek Figat
2021-03-22 20:04:57 +01:00
parent 39a6d0d292
commit d65ae8de96
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Engine/Content/BinaryAsset.cpp
View File

@@ -1,6 +1,7 @@
// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved. // Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
#include "BinaryAsset.h" #include "BinaryAsset.h"
#include "Cache/AssetsCache.h"
#include "Storage/ContentStorageManager.h" #include "Storage/ContentStorageManager.h"
#include "Loading/Tasks/LoadAssetDataTask.h" #include "Loading/Tasks/LoadAssetDataTask.h"
#include "Engine/ContentImporters/AssetsImportingManager.h" #include "Engine/ContentImporters/AssetsImportingManager.h"
@@ -303,9 +304,13 @@ bool BinaryAsset::SaveAsset(const StringView& path, AssetInitData& data, bool si
bool BinaryAsset::SaveToAsset(const StringView& path, AssetInitData& data, bool silentMode) bool BinaryAsset::SaveToAsset(const StringView& path, AssetInitData& data, bool silentMode)
{ {
// Ensure path is in a valid format
String pathNorm(path);
FileSystem::NormalizePath(pathNorm);
// Find target storage container and the asset // Find target storage container and the asset
auto storage = ContentStorageManager::TryGetStorage(path); auto storage = ContentStorageManager::TryGetStorage(pathNorm);
auto asset = Content::GetAsset(path); auto asset = Content::GetAsset(pathNorm);
auto binaryAsset = dynamic_cast<BinaryAsset*>(asset); auto binaryAsset = dynamic_cast<BinaryAsset*>(asset);
if (asset && !binaryAsset) if (asset && !binaryAsset)
{ {
@@ -351,12 +356,18 @@ bool BinaryAsset::SaveToAsset(const StringView& path, AssetInitData& data, bool
} }
else else
{ {
ASSERT(path.HasChars()); ASSERT(pathNorm.HasChars());
result = FlaxStorage::Create(path, data, silentMode); result = FlaxStorage::Create(pathNorm, data, silentMode);
} }
if (binaryAsset) if (binaryAsset)
binaryAsset->_isSaving = false; binaryAsset->_isSaving = false;
if (!result)
{
// Ensure to have valid cached data about the asset in the registry
Content::GetRegistry()->RegisterAsset(data.Header, pathNorm);
}
return result; return result;
} }