Skip to content
Permalink
Browse files

VolumeWii: Check SupportsReadWiiDecrypted before m_encrypted

Fixes using DirectoryBlob on extracted games that were unencrypted
prior to being extracted.

(One day I'll make DirectoryBlob actually support raw reads and then
the order of these two won't matter...)
  • Loading branch information
JosJuice committed Nov 26, 2019
1 parent 70ee523 commit 23fc5f9e35790b8863714e31595fac5051c3cfb5
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 23fc5f9

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