Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #8774 from JosJuice/volumeverifier-ios9
VolumeVerifier: Treat IOS9 as always present
  • Loading branch information
lioncash committed Apr 29, 2020
2 parents 295accb + 5b722b7 commit 2a7f150
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions Source/Core/DiscIO/VolumeVerifier.cpp
Expand Up @@ -607,12 +607,17 @@ bool VolumeVerifier::CheckPartition(const Partition& partition)

if (type == PARTITION_UPDATE)
{
std::unique_ptr<FileInfo> file_info = filesystem->FindFileInfo("_sys");
bool has_correct_ios = false;
if (file_info)
const IOS::ES::TMDReader& tmd = m_volume.GetTMD(m_volume.GetGamePartition());

// IOS9 is the only IOS which can be assumed to exist in a working state on any Wii
// regardless of what updates have been installed. At least Mario Party 8
// (RM8E01, revision 2) uses IOS9 without having it in its update partition.
bool has_correct_ios = tmd.IsValid() && (tmd.GetIOSId() & 0xFF) == 9;

if (!has_correct_ios && tmd.IsValid())
{
const IOS::ES::TMDReader& tmd = m_volume.GetTMD(m_volume.GetGamePartition());
if (tmd.IsValid())
std::unique_ptr<FileInfo> file_info = filesystem->FindFileInfo("_sys");
if (file_info)
{
const std::string correct_ios = "IOS" + std::to_string(tmd.GetIOSId() & 0xFF) + "-";
for (const FileInfo& f : *file_info)
Expand Down

0 comments on commit 2a7f150

Please sign in to comment.