Merge pull request #1556 from comex/project-moration

Rudimentary version of Wii IPC determinism.  Ported from my old udpnet branch.

1 files changed, 4 insertions, 6 deletions

diff --git a/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp b/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp
index 935ea03fee..a57774a8cd 100644
--- a/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp
+++ b/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp
@@ -162,12 +162,10 @@ void InterfaceConfigPane::LoadGUIValues()
 
 void InterfaceConfigPane::LoadThemes()
 {
-	CFileSearch::XStringVector theme_dirs;
-	theme_dirs.push_back(File::GetUserPath(D_THEMES_IDX));
-	theme_dirs.push_back(File::GetSysDirectory() + THEMES_DIR);
-
-	CFileSearch cfs(CFileSearch::XStringVector(1, "*"), theme_dirs);
-	auto const& sv = cfs.GetFileNames();
+	auto sv = DoFileSearch({"*"}, {
+		File::GetUserPath(D_THEMES_IDX),
+		File::GetSysDirectory() + THEMES_DIR
+	}, /*recursive*/ false);
 	for (const std::string& filename : sv)
 	{
 		std::string name, ext;