summaryrefslogtreecommitdiff
path: root/Source/Core/DiscIO/VolumeWii.cpp
diff options
context:
space:
mode:
authorAnthony <Helios747@users.noreply.github.com>2019-11-27 15:33:43 -0800
committerGitHub <noreply@github.com>2019-11-27 15:33:43 -0800
commit44f85bbc5e5f6aef30fa6eaf1b88415061282980 (patch)
tree3daf66eeeddc9bd9f3aa64180a4aa2d2fcd886f3 /Source/Core/DiscIO/VolumeWii.cpp
parentf20c1c2f8ddd6c32e751dd39a6182572712c4af0 (diff)
parent23fc5f9e35790b8863714e31595fac5051c3cfb5 (diff)
Merge pull request #8496 from JosJuice/volumewii-check-decrypted-order
VolumeWii: Check SupportsReadWiiDecrypted before m_encrypted
Diffstat (limited to 'Source/Core/DiscIO/VolumeWii.cpp')
-rw-r--r--Source/Core/DiscIO/VolumeWii.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/DiscIO/VolumeWii.cpp b/Source/Core/DiscIO/VolumeWii.cpp
index bc39a7aae4..d2a1fba3db 100644
--- a/Source/Core/DiscIO/VolumeWii.cpp
+++ b/Source/Core/DiscIO/VolumeWii.cpp
@@ -162,6 +162,9 @@ bool VolumeWii::Read(u64 offset, u64 length, u8* buffer, const Partition& partit
if (partition == PARTITION_NONE)
return m_reader->Read(offset, length, buffer);
+ if (m_reader->SupportsReadWiiDecrypted())
+ return m_reader->ReadWiiDecrypted(offset, length, buffer, partition.offset);
+
auto it = m_partitions.find(partition);
if (it == m_partitions.end())
return false;
@@ -173,9 +176,6 @@ bool VolumeWii::Read(u64 offset, u64 length, u8* buffer, const Partition& partit
buffer);
}
- if (m_reader->SupportsReadWiiDecrypted())
- return m_reader->ReadWiiDecrypted(offset, length, buffer, partition.offset);
-
mbedtls_aes_context* aes_context = partition_details.key->get();
if (!aes_context)
return false;