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

Adjustment for deleteFileSafety in #3992

Browse Source
This commit is contained in:
Wojtek Figat
2026-03-10 14:16:08 +01:00
parent 90ffc4e5f9
commit a0bb8efc2b
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Content/Asset.cpp
View File

@@ -316,7 +316,7 @@ void Asset::OnDeleteObject()
// Delete file
if (!IsVirtual())
Content::deleteFileSafety(path, id);
Content::deleteFileSafety(path, &id);
}
#endif
}

14
Source/Engine/Content/Content.cpp
View File

@@ -808,7 +808,7 @@ void Content::DeleteScript(const StringView& path)
LOG(Info, "Deleting script '{0}'", path);
// Delete file
deleteFileSafety(path, Guid::Empty, false);
deleteFileSafety(path);
#endif
}
@@ -840,13 +840,13 @@ void Content::DeleteAsset(const StringView& path)
}
// Delete file
deleteFileSafety(path, info.ID);
deleteFileSafety(path, &info.ID);
#endif
}
void Content::deleteFileSafety(const StringView& path, const Guid& id, bool useId)
void Content::deleteFileSafety(const StringView& path, const Guid* id)
{
if (!id.IsValid() && useId)
if (id && !id->IsValid())
{
LOG(Warning, "Cannot remove file \'{0}\'. Given ID is invalid.", path);
return;
@@ -855,12 +855,12 @@ void Content::deleteFileSafety(const StringView& path, const Guid& id, bool useI
// Ensure that file has the same ID (prevent from deleting different assets)
auto storage = ContentStorageManager::TryGetStorage(path);
if (storage && useId)
if (storage && id)
{
storage->CloseFileHandles(); // Close file handle to allow removing it
if (!storage->HasAsset(id))
if (!storage->HasAsset(*id))
{
LOG(Warning, "Cannot remove file \'{0}\'. It doesn\'t contain asset {1}.", path, id);
LOG(Warning, "Cannot remove file \'{0}\'. It doesn\'t contain asset {1}.", path, *id);
return;
}
}

2
Source/Engine/Content/Content.h
View File

@@ -395,7 +395,7 @@ private:
static void onAssetLoaded(Asset* asset);
static void onAssetUnload(Asset* asset);
static void onAssetChangeId(Asset* asset, const Guid& oldId, const Guid& newId);
static void deleteFileSafety(const StringView& path, const Guid& id, bool useId = true);
static void deleteFileSafety(const StringView& path, const Guid* id = nullptr);
// Internal bindings
#if !COMPILE_WITHOUT_CSHARP