Skip to content
Permalink
Browse files

Merge pull request #8496 from JosJuice/volumewii-check-decrypted-order

VolumeWii: Check SupportsReadWiiDecrypted before m_encrypted
  • Loading branch information
Helios747 committed Nov 27, 2019
2 parents f20c1c2 + 23fc5f9 commit 44f85bbc5e5f6aef30fa6eaf1b88415061282980
Showing with 3 additions and 3 deletions.
  1. +3 −3 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;

0 comments on commit 44f85bb

Please sign in to comment.
You can’t perform that action at this time.