From 43a4d418896f47ea971ccd83d5630a97f0f0000b Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Mon, 17 Jun 2013 19:25:55 +1200 Subject: [PATCH] Handle 1 partition only, fixes Issue #6353 --- Source/Core/DolphinWX/Src/ISOProperties.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index 3b2a79748d..efd84521f8 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -818,14 +818,24 @@ void CISOProperties::OnExtractDir(wxCommandEvent& event) void CISOProperties::OnExtractDataFromHeader(wxCommandEvent& event) { std::vector fst; - DiscIO::IFileSystem *FS = 0; + DiscIO::IFileSystem *FS = NULL; wxString Path = wxDirSelector(_("Choose the folder to extract to")); if (Path.empty()) return; if (DiscIO::IsVolumeWiiDisc(OpenISO)) - FS = WiiDisc.at(1).FileSystem; + if(WiiDisc.size() > 0) + { + // Get the filesystem of the LAST partition + FS = WiiDisc.at(WiiDisc.size() - 1).FileSystem; + } + else + { + PanicAlertT("No partitions found for: %s!", + WxStrToStr(Path).c_str()); + return; + } else FS = pFileSystem;