livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged in DRTVWR-519 (pull request #567) 

BUG-230697: Do not crash viewer during cache cleanup

Approved-by: Callum Linden
meow-7.2.2
Ansariel Hiller 2021-05-11 19:59:21 +00:00 committed by Callum Linden
parent 99b99a1b4a 8633ba9c8b
commit 1ec6c10c14
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/llfilesystem/lldiskcache.cpp
View File

@ -102,7 +102,12 @@ void LLDiskCache::purge()
if (file_size_total > mMaxSizeBytes)
{
action = "DELETE:";
boost::filesystem::remove(entry.second.second);
boost::system::error_code ec;
boost::filesystem::remove(entry.second.second, ec);
if (ec.failed())
{
LL_WARNS() << "Failed to delete cache file " << entry.second.second << ": " << ec.message() << LL_ENDL;
}
}
else
{
@ -284,7 +289,12 @@ void LLDiskCache::clearCache()
{
if (entry.path().string().find(mCacheFilenamePrefix) != std::string::npos)
{
boost::filesystem::remove(entry);
boost::system::error_code ec;
boost::filesystem::remove(entry, ec);
if (ec.failed())
{
LL_WARNS() << "Failed to delete cache file " << entry << ": " << ec.message() << LL_ENDL;
}
}
}
}