Merge pull request #1768 from JosJuice/filemonitor-regression

Re-add FileMonitor support for Wii discs

1 files changed, 12 insertions, 11 deletions

diff --git a/Source/Core/DiscIO/FileMonitor.cpp b/Source/Core/DiscIO/FileMonitor.cpp
index 770716d2ca..16c110716e 100644
--- a/Source/Core/DiscIO/FileMonitor.cpp
+++ b/Source/Core/DiscIO/FileMonitor.cpp
@@ -27,7 +27,7 @@ namespace FileMon
 
 static DiscIO::IVolume *OpenISO = nullptr;
 static DiscIO::IFileSystem *pFileSystem = nullptr;
-static std::vector<const DiscIO::SFileInfo *> GCFiles;
+static std::vector<const DiscIO::SFileInfo *> DiscFiles;
 static std::string ISOFile = "", CurrentFile = "";
 static bool FileAccess = true;
 
@@ -58,8 +58,8 @@ bool IsSoundFile(const std::string& filename)
 }
 
 
-// Read the GC file system
-void ReadGC(const std::string& filename)
+// Read the file system
+void ReadFileSystem(const std::string& filename)
 {
 	// Should have an actual Shutdown procedure or something
 	if (OpenISO != nullptr)
@@ -73,21 +73,22 @@ void ReadGC(const std::string& filename)
 		pFileSystem = nullptr;
 	}
 
-	// GCFiles' pointers are no longer valid after pFileSystem is cleared
-	GCFiles.clear();
+	// DiscFiles' pointers are no longer valid after pFileSystem is cleared
+	DiscFiles.clear();
 	OpenISO = DiscIO::CreateVolumeFromFilename(filename);
 	if (!OpenISO)
 		return;
 
-	if (!DiscIO::IsVolumeWiiDisc(OpenISO) && !DiscIO::IsVolumeWadFile(OpenISO))
+	if (!DiscIO::IsVolumeWadFile(OpenISO))
 	{
 		pFileSystem = DiscIO::CreateFileSystem(OpenISO);
 
 		if (!pFileSystem)
 			return;
 
-		pFileSystem->GetFileList(GCFiles);
+		pFileSystem->GetFileList(DiscFiles);
 	}
+
 	FileAccess = true;
 }
 
@@ -119,7 +120,7 @@ void CheckFile(const std::string& file, u64 size)
 }
 
 
-// Find the GC filename
+// Find the filename
 void FindFilename(u64 offset)
 {
 	// Don't do anything if a game is not running
@@ -137,7 +138,7 @@ void FindFilename(u64 offset)
 	if (!pFileSystem || ISOFile != SConfig::GetInstance().m_LastFilename)
 	{
 		FileAccess = false;
-		ReadGC(SConfig::GetInstance().m_LastFilename);
+		ReadFileSystem(SConfig::GetInstance().m_LastFilename);
 		ISOFile = SConfig::GetInstance().m_LastFilename;
 		INFO_LOG(FILEMON, "Opening '%s'", ISOFile.c_str());
 		return;
@@ -165,8 +166,8 @@ void Close()
 		pFileSystem = nullptr;
 	}
 
-	// GCFiles' pointers are no longer valid after pFileSystem is cleared
-	GCFiles.clear();
+	// DiscFiles' pointers are no longer valid after pFileSystem is cleared
+	DiscFiles.clear();
 
 	ISOFile = "";
 	CurrentFile = "";