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 removeCommonPath throwing an exception when path does not exist.

Browse source
This commit is contained in:
Aloshi 2014-08-13 18:45:26 -05:00
parent fb16dd8a91
commit 8739519e15
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
es-core/src/Util.cpp
View file

@ -103,6 +103,13 @@ fs::path resolvePath(const fs::path& path, const fs::path& relativeTo, bool allo
// example: removeCommonPath("/home/pi/roms/nes/foo/bar.nes", "/home/pi/roms/nes/") returns "foo/bar.nes" // example: removeCommonPath("/home/pi/roms/nes/foo/bar.nes", "/home/pi/roms/nes/") returns "foo/bar.nes"
fs::path removeCommonPath(const fs::path& path, const fs::path& relativeTo, bool& contains) fs::path removeCommonPath(const fs::path& path, const fs::path& relativeTo, bool& contains)
{ {
// if either of these doesn't exist, fs::canonical() is going to throw an error
if(!fs::exists(path) || !fs::exists(relativeTo))
{
contains = false;
return path;
}
fs::path p = fs::canonical(path); fs::path p = fs::canonical(path);
fs::path r = fs::canonical(relativeTo); fs::path r = fs::canonical(relativeTo);