From 8624461315c5baaf23b3d13a0365de69a95266e6 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Thu, 25 Dec 2014 11:01:18 +0100 Subject: [PATCH] Re-add FileMonitor support for Wii discs This in done in the same way as GC discs, unlike the previous implementation. --- Source/Core/DiscIO/FileMonitor.cpp | 2 +- Source/Core/DiscIO/VolumeWiiCrypted.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Core/DiscIO/FileMonitor.cpp b/Source/Core/DiscIO/FileMonitor.cpp index 770716d2ca..6cb8c410ef 100644 --- a/Source/Core/DiscIO/FileMonitor.cpp +++ b/Source/Core/DiscIO/FileMonitor.cpp @@ -79,7 +79,7 @@ void ReadGC(const std::string& filename) if (!OpenISO) return; - if (!DiscIO::IsVolumeWiiDisc(OpenISO) && !DiscIO::IsVolumeWadFile(OpenISO)) + if (!DiscIO::IsVolumeWadFile(OpenISO)) { pFileSystem = DiscIO::CreateFileSystem(OpenISO); diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/VolumeWiiCrypted.cpp index e769a1cae8..0f44230476 100644 --- a/Source/Core/DiscIO/VolumeWiiCrypted.cpp +++ b/Source/Core/DiscIO/VolumeWiiCrypted.cpp @@ -14,6 +14,7 @@ #include "Common/MsgHandler.h" #include "Common/Logging/Log.h" #include "DiscIO/Blob.h" +#include "DiscIO/FileMonitor.h" #include "DiscIO/Volume.h" #include "DiscIO/VolumeCreator.h" #include "DiscIO/VolumeGC.h" @@ -69,6 +70,8 @@ bool CVolumeWiiCrypted::Read(u64 _ReadOffset, u64 _Length, u8* _pBuffer) const if (m_pReader == nullptr) return(false); + FileMon::FindFilename(_ReadOffset); + while (_Length > 0) { static unsigned char IV[16];