empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Filesystem: Use filesystem functions that don't throw exceptions when an error occurs (fixes crash on Ubuntu in "Try Ubuntu" mode)

Browse source
This commit is contained in:
Sour 2018-06-09 14:10:21 -04:00
parent 335a133e0a
commit dc03c2eb63
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Utilities/FolderUtilities.cpp
View file

@ -122,14 +122,16 @@ string FolderUtilities::GetRecentGamesFolder()
#ifndef LIBRETRO #ifndef LIBRETRO
void FolderUtilities::CreateFolder(string folder) void FolderUtilities::CreateFolder(string folder)
{ {
fs::create_directory(fs::u8path(folder)); std::error_code errorCode;
fs::create_directory(fs::u8path(folder), errorCode);
} }
vector<string> FolderUtilities::GetFolders(string rootFolder) vector<string> FolderUtilities::GetFolders(string rootFolder)
{ {
vector<string> folders; vector<string> folders;
if(!fs::is_directory(fs::u8path(rootFolder))) { std::error_code errorCode;
if(!fs::is_directory(fs::u8path(rootFolder), errorCode)) {
return folders; return folders;
} }
@ -138,7 +140,7 @@ vector<string> FolderUtilities::GetFolders(string rootFolder)
//Prevent excessive recursion //Prevent excessive recursion
i.disable_recursion_pending(); i.disable_recursion_pending();
} else { } else {
if(fs::is_directory(i->path())) { if(fs::is_directory(i->path(), errorCode)) {
folders.push_back(i->path().u8string()); folders.push_back(i->path().u8string());
} }
} }
@ -152,7 +154,8 @@ vector<string> FolderUtilities::GetFilesInFolder(string rootFolder, std::unorder
vector<string> files; vector<string> files;
vector<string> folders = { { rootFolder } }; vector<string> folders = { { rootFolder } };
if(!fs::is_directory(fs::u8path(rootFolder))) { std::error_code errorCode;
if(!fs::is_directory(fs::u8path(rootFolder), errorCode)) {
return files; return files;
} }
@ -201,7 +204,8 @@ string FolderUtilities::CombinePath(string folder, string filename)
int64_t FolderUtilities::GetFileModificationTime(string filepath) int64_t FolderUtilities::GetFileModificationTime(string filepath)
{ {
return fs::last_write_time(fs::u8path(filepath)).time_since_epoch() / std::chrono::seconds(1); std::error_code errorCode;
return fs::last_write_time(fs::u8path(filepath), errorCode).time_since_epoch() / std::chrono::seconds(1);
} }
#else #else