Merge pull request #1895 from JosJuice/isvolumewiidisc

Don't read from disk when checking volume type
This commit is contained in:
Ryan Houdek
2015-01-21 13:45:28 -06:00
19 changed files with 61 additions and 56 deletions

View File

@ -61,8 +61,8 @@ GameFile::GameFile(const QString& fileName)
if (volume != nullptr)
{
if (!DiscIO::IsVolumeWadFile(volume))
m_platform = DiscIO::IsVolumeWiiDisc(volume) ? WII_DISC : GAMECUBE_DISC;
if (!volume->IsWadFile())
m_platform = volume->IsWiiDisc() ? WII_DISC : GAMECUBE_DISC;
else
m_platform = WII_WAD;
@ -305,7 +305,7 @@ const QString GameFile::GetWiiFSPath() const
if (volume == nullptr)
return ret;
if (DiscIO::IsVolumeWiiDisc(volume) || DiscIO::IsVolumeWadFile(volume))
if (volume->IsWiiDisc() || volume->IsWadFile())
{
std::string path;
u64 title;