diff options
| author | bunnei <bunneidev@gmail.com> | 2016-06-01 21:19:16 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2016-06-01 21:19:16 -0400 |
| commit | d9f1cf44f6895e5a5f2bd2ede58729c8ee29c06f (patch) | |
| tree | b779fade21bc2cddf1424d4808ee237fbd9d3ee9 /src | |
| parent | e88a0206f1f6523074d40bfa05a527d2ccf7fb1a (diff) | |
| parent | afcac8ad3049454fc8efcbdf0dce6c89bf99ee32 (diff) | |
Merge pull request #1871 from LFsWang/prevent-load-warn-msg
AddFstEntriesToGameList - prevent loading a directory as a file
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra_qt/game_list.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/citra_qt/game_list.cpp b/src/citra_qt/game_list.cpp index 49cb98e702..15484fae38 100644 --- a/src/citra_qt/game_list.cpp +++ b/src/citra_qt/game_list.cpp @@ -130,9 +130,7 @@ void GameListWorker::AddFstEntriesToGameList(const std::string& dir_path, unsign if (stop_processing) return false; // Breaks the callback loop. - if (recursion > 0 && FileUtil::IsDirectory(physical_name)) { - AddFstEntriesToGameList(physical_name, recursion - 1); - } else { + if (!FileUtil::IsDirectory(physical_name)) { std::unique_ptr<Loader::AppLoader> loader = Loader::GetLoader(physical_name); if (!loader) return true; @@ -145,6 +143,8 @@ void GameListWorker::AddFstEntriesToGameList(const std::string& dir_path, unsign new GameListItem(QString::fromStdString(Loader::GetFileTypeString(loader->GetFileType()))), new GameListItemSize(FileUtil::GetSize(physical_name)), }); + } else if (recursion > 0) { + AddFstEntriesToGameList(physical_name, recursion - 1); } return true; |
