Merge pull request #2643 from comex/fix-do-file-search

Fix DoFileSearch returning the passed-in directories themselves.
dolphin-emu · Jun 25, 2015 · da7ec75 · da7ec75
2 parents 7500605 + acd6cb7
commit da7ec75
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/Source/Core/Common/FileSearch.cpp b/Source/Core/Common/FileSearch.cpp
@@ -28,7 +28,8 @@ static std::vector<std::string> FileSearchWithTest(const std::vector<std::string
 			for (auto& child : entry.children)
 				DoEntry(child);
 		};
-		DoEntry(top);
+		for (auto& child : top.children)
+			DoEntry(child);
 	}
 	// remove duplicates
 	std::sort(result.begin(), result.end());
@@ -53,6 +54,7 @@ std::vector<std::string> DoFileSearch(const std::vector<std::string>& globs, con
 	});
 }
 
+// Result includes the passed directories themselves as well as their subdirectories.
 std::vector<std::string> FindSubdirectories(const std::vector<std::string>& directories, bool recursive)
 {
 	return FileSearchWithTest(directories, true, [&](const File::FSTEntry& entry) {

diff --git a/Source/Core/DolphinQt/GameList/GameTracker.cpp b/Source/Core/DolphinQt/GameList/GameTracker.cpp
@@ -80,16 +80,13 @@ void DGameTracker::ScanForGames()
 
 	delete m_watcher;
 	m_watcher = new QFileSystemWatcher(this);
+	for (std::string dir : SConfig::GetInstance().m_ISOFolder)
+		m_watcher->addPath(QString::fromStdString(dir));
 	if (SConfig::GetInstance().m_RecursiveISOFolder)
 	{
 		for (std::string dir : FindSubdirectories(SConfig::GetInstance().m_ISOFolder, /*recursive*/ true))
 			m_watcher->addPath(QString::fromStdString(dir));
 	}
-	else
-	{
-		for (std::string dir : SConfig::GetInstance().m_ISOFolder)
-			m_watcher->addPath(QString::fromStdString(dir));
-	}
 
 	std::vector<std::string> exts;
 	if (SConfig::GetInstance().m_ListGC)