summaryrefslogtreecommitdiff
path: root/Source/Core/DiscIO/VolumeWiiCrypted.cpp
diff options
context:
space:
mode:
authorshuffle2 <godisgovernment@gmail.com>2017-06-06 01:37:52 -0700
committerGitHub <noreply@github.com>2017-06-06 01:37:52 -0700
commit1113b131f209c6b0c8095c4c8155371ae2cb9de9 (patch)
tree28d1bf90e1b8bfbf0a63580e6b038833117abbe5 /Source/Core/DiscIO/VolumeWiiCrypted.cpp
parent4e0b44a18888444089a1669c3d95c5567b6a1503 (diff)
parent69f01bac393f2140463fd71d294998f630057bc5 (diff)
Merge pull request #5548 from JosJuice/volume-wii-unencrypted
Reimplement support for unencrypted Wii discs
Diffstat (limited to 'Source/Core/DiscIO/VolumeWiiCrypted.cpp')
-rw-r--r--Source/Core/DiscIO/VolumeWiiCrypted.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/VolumeWiiCrypted.cpp
index c0830d5139..ad03406caa 100644
--- a/Source/Core/DiscIO/VolumeWiiCrypted.cpp
+++ b/Source/Core/DiscIO/VolumeWiiCrypted.cpp
@@ -36,6 +36,12 @@ CVolumeWiiCrypted::CVolumeWiiCrypted(std::unique_ptr<IBlobReader> reader)
{
_assert_(m_pReader);
+ if (m_pReader->ReadSwapped<u32>(0x60) != u32(0))
+ {
+ // No partitions - just read unencrypted data like with a GC disc
+ return;
+ }
+
// Get tickets, TMDs, and decryption keys for all partitions
for (u32 partition_group = 0; partition_group < 4; ++partition_group)
{