Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-17 22:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for empty paths breaking in getCanonicalPath().

Browse source
This commit is contained in:
Aloshi 2014-05-26 17:21:48 -05:00
parent e5ac225362
commit b221ecdd94
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Util.cpp
View file

@ -62,16 +62,11 @@ Eigen::Vector2f roundVector(const Eigen::Vector2f& vec)
return ret;
}
// embedded resources, e.g. ":/font.ttf", need to be properly handled too
std::string getCanonicalPath(const std::string& path)
{
// embedded resources, e.g. ":/font.ttf", need to be properly handled too
try
{
const std::string canonical = boost::filesystem::canonical(path).generic_string();
return canonical.empty() ? path : canonical;
}
catch (boost::filesystem::filesystem_error& e)
{
if(path.empty() || !boost::filesystem::exists(path))
return path;
}
return boost::filesystem::canonical(path).generic_string();
}