diff options
| author | skidau <skidau@gmail.com> | 2015-01-03 10:42:51 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2015-01-03 10:42:51 +1100 |
| commit | 3738d27b2441a22836e56611a54e9f79fc6210b0 (patch) | |
| tree | 06037f029e01d7b6b3a0a38ea23491ab032baaaa /Source/Core/DiscIO/VolumeGC.cpp | |
| parent | 598dc033f2cfca10647d1fe476039e405c3a835b (diff) | |
| parent | bb93336ecf9f74c59cab21a582704cba189e813f (diff) | |
Merge pull request #1776 from JosJuice/cleanrip-wii-discs
Fix CleanRip reading Wii discs
Diffstat (limited to 'Source/Core/DiscIO/VolumeGC.cpp')
| -rw-r--r-- | Source/Core/DiscIO/VolumeGC.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp index 57303b13e7..984a82ce3b 100644 --- a/Source/Core/DiscIO/VolumeGC.cpp +++ b/Source/Core/DiscIO/VolumeGC.cpp @@ -24,8 +24,11 @@ CVolumeGC::~CVolumeGC() { } -bool CVolumeGC::Read(u64 _Offset, u64 _Length, u8* _pBuffer) const +bool CVolumeGC::Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt) const { + if (decrypt) + PanicAlertT("Tried to decrypt data from a non-Wii volume"); + if (m_pReader == nullptr) return false; @@ -34,11 +37,6 @@ bool CVolumeGC::Read(u64 _Offset, u64 _Length, u8* _pBuffer) const return m_pReader->Read(_Offset, _Length, _pBuffer); } -bool CVolumeGC::RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const -{ - return Read(_Offset, _Length, _pBuffer); -} - std::string CVolumeGC::GetUniqueID() const { static const std::string NO_UID("NO_UID"); |