summaryrefslogtreecommitdiffstats
path: root/src/citra_qt
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2016-05-31 02:59:10 +0200
committerbunnei <bunneidev@gmail.com>2016-05-31 02:59:10 +0200
commit08e09184df753c9622df263e1731e1890afd3eb2 (patch)
tree7640df3c67947ff7ee9ef0d4003c33ac2fbf7c96 /src/citra_qt
parentMerge pull request #1692 from Subv/rm_getpointer2 (diff)
parentCommon: Make recursive FileUtil functions take a maximum recursion (diff)
downloadyuzu-08e09184df753c9622df263e1731e1890afd3eb2.tar
yuzu-08e09184df753c9622df263e1731e1890afd3eb2.tar.gz
yuzu-08e09184df753c9622df263e1731e1890afd3eb2.tar.bz2
yuzu-08e09184df753c9622df263e1731e1890afd3eb2.tar.lz
yuzu-08e09184df753c9622df263e1731e1890afd3eb2.tar.xz
yuzu-08e09184df753c9622df263e1731e1890afd3eb2.tar.zst
yuzu-08e09184df753c9622df263e1731e1890afd3eb2.zip
Diffstat (limited to 'src/citra_qt')
-rw-r--r--src/citra_qt/game_list.cpp11
-rw-r--r--src/citra_qt/game_list_p.h2
2 files changed, 7 insertions, 6 deletions
diff --git a/src/citra_qt/game_list.cpp b/src/citra_qt/game_list.cpp
index 570647539..49cb98e70 100644
--- a/src/citra_qt/game_list.cpp
+++ b/src/citra_qt/game_list.cpp
@@ -118,19 +118,20 @@ void GameList::LoadInterfaceLayout()
item_model->sort(header->sortIndicatorSection(), header->sortIndicatorOrder());
}
-void GameListWorker::AddFstEntriesToGameList(const std::string& dir_path, bool deep_scan)
+void GameListWorker::AddFstEntriesToGameList(const std::string& dir_path, unsigned int recursion)
{
const auto callback = [&](unsigned* num_entries_out,
const std::string& directory,
- const std::string& virtual_name) -> bool {
+ const std::string& virtual_name,
+ unsigned int recursion) -> bool {
std::string physical_name = directory + DIR_SEP + virtual_name;
if (stop_processing)
return false; // Breaks the callback loop.
- if (deep_scan && FileUtil::IsDirectory(physical_name)) {
- AddFstEntriesToGameList(physical_name, true);
+ if (recursion > 0 && FileUtil::IsDirectory(physical_name)) {
+ AddFstEntriesToGameList(physical_name, recursion - 1);
} else {
std::unique_ptr<Loader::AppLoader> loader = Loader::GetLoader(physical_name);
if (!loader)
@@ -155,7 +156,7 @@ void GameListWorker::AddFstEntriesToGameList(const std::string& dir_path, bool d
void GameListWorker::run()
{
stop_processing = false;
- AddFstEntriesToGameList(dir_path.toStdString(), deep_scan);
+ AddFstEntriesToGameList(dir_path.toStdString(), deep_scan ? 256 : 0);
emit Finished();
}
diff --git a/src/citra_qt/game_list_p.h b/src/citra_qt/game_list_p.h
index 121f90b0c..353b2d1e2 100644
--- a/src/citra_qt/game_list_p.h
+++ b/src/citra_qt/game_list_p.h
@@ -181,5 +181,5 @@ private:
bool deep_scan;
std::atomic_bool stop_processing;
- void AddFstEntriesToGameList(const std::string& dir_path, bool deep_scan);
+ void AddFstEntriesToGameList(const std::string& dir_path, unsigned int recursion = 0);
};