N-archive/citra
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1871 from LFsWang/prevent-load-warn-msg

Browse source 
AddFstEntriesToGameList - prevent loading a directory as a file
This commit is contained in:
bunnei 2016-06-01 21:19:16 -04:00
parent 552018c50a d24d047d45
commit 63557e3fc1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/citra_qt/game_list.cpp
View file

@ -130,9 +130,7 @@ void GameListWorker::AddFstEntriesToGameList(const std::string& dir_path, unsign
if (stop_processing) if (stop_processing)
return false; // Breaks the callback loop. return false; // Breaks the callback loop.
if (recursion > 0 && FileUtil::IsDirectory(physical_name)) { if (!FileUtil::IsDirectory(physical_name)) {
AddFstEntriesToGameList(physical_name, recursion - 1);
} else {
std::unique_ptr<Loader::AppLoader> loader = Loader::GetLoader(physical_name); std::unique_ptr<Loader::AppLoader> loader = Loader::GetLoader(physical_name);
if (!loader) if (!loader)
return true; return true;
@ -145,6 +143,8 @@ void GameListWorker::AddFstEntriesToGameList(const std::string& dir_path, unsign
new GameListItem(QString::fromStdString(Loader::GetFileTypeString(loader->GetFileType()))), new GameListItem(QString::fromStdString(Loader::GetFileTypeString(loader->GetFileType()))),
new GameListItemSize(FileUtil::GetSize(physical_name)), new GameListItemSize(FileUtil::GetSize(physical_name)),
}); });
} else if (recursion > 0) {
AddFstEntriesToGameList(physical_name, recursion - 1);
} }
return true; return true;