piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

ISOProperties: Correctly handle partitions with 0 files

Browse Source
This commit is contained in:
JosJuice 2015-04-25 15:33:20 +02:00
parent 645aa5af8b
commit fbed0b4a9c
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/DolphinWX/ISOProperties.cpp
View File

@ -255,7 +255,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
wxTreeItemId PartitionRoot = wxTreeItemId PartitionRoot =
m_Treectrl->AppendItem(RootId, wxString::Format(_("Partition %i"), partition_count), 0, 0); m_Treectrl->AppendItem(RootId, wxString::Format(_("Partition %i"), partition_count), 0, 0);
m_Treectrl->SetItemData(PartitionRoot, new WiiPartition(partition)); m_Treectrl->SetItemData(PartitionRoot, new WiiPartition(partition));
CreateDirectoryTree(PartitionRoot, partition.Files, 1, partition.Files.at(0)->m_FileSize); CreateDirectoryTree(PartitionRoot, partition.Files);
if (partition_count == 1) if (partition_count == 1)
m_Treectrl->Expand(PartitionRoot); m_Treectrl->Expand(PartitionRoot);
partition_count++; partition_count++;
@ -275,7 +275,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
if (pFileSystem) if (pFileSystem)
pFileSystem->GetFileList(GCFiles); pFileSystem->GetFileList(GCFiles);
if (!GCFiles.empty()) if (!GCFiles.empty())
CreateDirectoryTree(RootId, GCFiles, 1, GCFiles.at(0)->m_FileSize); CreateDirectoryTree(RootId, GCFiles);
} }
m_Treectrl->Expand(RootId); m_Treectrl->Expand(RootId);
@ -292,6 +292,14 @@ CISOProperties::~CISOProperties()
delete OpenISO; delete OpenISO;
} }
size_t CISOProperties::CreateDirectoryTree(wxTreeItemId& parent, std::vector<const DiscIO::SFileInfo*> fileInfos)
{
if (fileInfos.empty())
return 0;
else
return CreateDirectoryTree(parent, fileInfos, 1, fileInfos.at(0)->m_FileSize);
}
size_t CISOProperties::CreateDirectoryTree(wxTreeItemId& parent, size_t CISOProperties::CreateDirectoryTree(wxTreeItemId& parent,
std::vector<const DiscIO::SFileInfo*> fileInfos, std::vector<const DiscIO::SFileInfo*> fileInfos,
const size_t _FirstIndex, const size_t _FirstIndex,

2
Source/Core/DolphinWX/ISOProperties.h
View File

@ -221,6 +221,8 @@ private:
std::vector<const DiscIO::SFileInfo*> GCFiles; std::vector<const DiscIO::SFileInfo*> GCFiles;
typedef std::vector<const DiscIO::SFileInfo*>::iterator fileIter; typedef std::vector<const DiscIO::SFileInfo*>::iterator fileIter;
size_t CreateDirectoryTree(wxTreeItemId& parent,
std::vector<const DiscIO::SFileInfo*> fileInfos);
size_t CreateDirectoryTree(wxTreeItemId& parent, size_t CreateDirectoryTree(wxTreeItemId& parent,
std::vector<const DiscIO::SFileInfo*> fileInfos, std::vector<const DiscIO::SFileInfo*> fileInfos,
const size_t _FirstIndex, const size_t _FirstIndex,