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

MAINT-7691 Fixed cache not clearing correctly and incapability to find dump files in case of unicode path

master
andreykproductengine 2017-08-18 20:23:06 +03:00
parent 7d4c1510e4
commit 0fe28a7a03
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/llvfs/lldir.cpp
View File

@ -108,8 +108,13 @@ LLDir::~LLDir()
std::vector<std::string> LLDir::getFilesInDir(const std::string &dirname)
{
//Returns a vector of fullpath filenames.
boost::filesystem::path p (dirname);
#ifdef LL_WINDOWS // or BOOST_WINDOWS_API
boost::filesystem::path p(utf8str_to_utf16str(dirname));
#else
boost::filesystem::path p(dirname);
#endif
std::vector<std::string> v;
if (exists(p))
@ -199,7 +204,12 @@ U32 LLDir::deleteDirAndContents(const std::string& dir_name)
try
{
boost::filesystem::path dir_path(dir_name);
#ifdef LL_WINDOWS // or BOOST_WINDOWS_API
boost::filesystem::path dir_path(utf8str_to_utf16str(dir_name));
#else
boost::filesystem::path dir_path(dir_name);
#endif
if (boost::filesystem::exists (dir_path))
{
if (!boost::filesystem::is_empty (dir_path))