From a09283cf9f1df31462323409720e2053bbe0e6d2 Mon Sep 17 00:00:00 2001 From: magumagu Date: Sun, 15 Jun 2014 21:44:21 -0700 Subject: [PATCH] ISOProperties: show all paritions on property page. --- Source/Core/DolphinWX/ISOProperties.cpp | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/Source/Core/DolphinWX/ISOProperties.cpp b/Source/Core/DolphinWX/ISOProperties.cpp index 691c0a8e5e..85c101c0f0 100644 --- a/Source/Core/DolphinWX/ISOProperties.cpp +++ b/Source/Core/DolphinWX/ISOProperties.cpp @@ -130,20 +130,23 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW bool IsWiiDisc = DiscIO::IsVolumeWiiDisc(OpenISO); if (IsWiiDisc) { - for (u32 i = 0; i < 0xFFFFFFFF; i++) // yes, technically there can be OVER NINE THOUSAND partitions... + for (int group = 0; group < 4; group++) { - WiiPartition temp; - if ((temp.Partition = DiscIO::CreateVolumeFromFilename(fileName, 0, i)) != nullptr) + for (u32 i = 0; i < 0xFFFFFFFF; i++) // yes, technically there can be OVER NINE THOUSAND partitions... { - if ((temp.FileSystem = DiscIO::CreateFileSystem(temp.Partition)) != nullptr) + WiiPartition temp; + if ((temp.Partition = DiscIO::CreateVolumeFromFilename(fileName, group, i)) != nullptr) { - temp.FileSystem->GetFileList(temp.Files); - WiiDisc.push_back(temp); + if ((temp.FileSystem = DiscIO::CreateFileSystem(temp.Partition)) != nullptr) + { + temp.FileSystem->GetFileList(temp.Files); + WiiDisc.push_back(temp); + } + } + else + { + break; } - } - else - { - break; } } }