diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2015-01-21 13:45:28 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2015-01-21 13:45:28 -0600 |
| commit | f9fc9d47c0ac7692afcdc06582803776e109e0c0 (patch) | |
| tree | 7fa71a5b089ded8d87938ad1e03deb5ecf9fd80d /Source/Core/DolphinWX/ISOFile.cpp | |
| parent | 4c9fd63562a7514e16fb21f4bdd6a039fde1cb4c (diff) | |
| parent | ace060748b572063b33acee13c19000783a6cdde (diff) | |
Merge pull request #1895 from JosJuice/isvolumewiidisc
Don't read from disk when checking volume type
Diffstat (limited to 'Source/Core/DolphinWX/ISOFile.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/ISOFile.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp index 8d61d9f4d4..8d25e24d29 100644 --- a/Source/Core/DolphinWX/ISOFile.cpp +++ b/Source/Core/DolphinWX/ISOFile.cpp @@ -62,14 +62,14 @@ GameListItem::GameListItem(const std::string& _rFileName) if (pVolume != nullptr) { - if (!DiscIO::IsVolumeWadFile(pVolume)) - m_Platform = DiscIO::IsVolumeWiiDisc(pVolume) ? WII_DISC : GAMECUBE_DISC; + if (!pVolume->IsWadFile()) + m_Platform = pVolume->IsWiiDisc() ? WII_DISC : GAMECUBE_DISC; else m_Platform = WII_WAD; m_volume_names = pVolume->GetNames(); - m_Country = pVolume->GetCountry(); + m_Country = pVolume->GetCountry(); m_FileSize = pVolume->GetRawSize(); m_VolumeSize = pVolume->GetSize(); @@ -281,7 +281,7 @@ const std::string GameListItem::GetWiiFSPath() const if (iso == nullptr) return ret; - if (DiscIO::IsVolumeWiiDisc(iso) || DiscIO::IsVolumeWadFile(iso)) + if (iso->IsWiiDisc() || iso->IsWadFile()) { u64 title = 0; |