summaryrefslogtreecommitdiff
path: root/Source/Core/DiscIO/BannerLoader.cpp
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@gmail.com>2015-01-21 13:45:28 -0600
committerRyan Houdek <Sonicadvance1@gmail.com>2015-01-21 13:45:28 -0600
commitf9fc9d47c0ac7692afcdc06582803776e109e0c0 (patch)
tree7fa71a5b089ded8d87938ad1e03deb5ecf9fd80d /Source/Core/DiscIO/BannerLoader.cpp
parent4c9fd63562a7514e16fb21f4bdd6a039fde1cb4c (diff)
parentace060748b572063b33acee13c19000783a6cdde (diff)
Merge pull request #1895 from JosJuice/isvolumewiidisc
Don't read from disk when checking volume type
Diffstat (limited to 'Source/Core/DiscIO/BannerLoader.cpp')
-rw-r--r--Source/Core/DiscIO/BannerLoader.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/Core/DiscIO/BannerLoader.cpp b/Source/Core/DiscIO/BannerLoader.cpp
index 3dc989684a..b5353b5a0f 100644
--- a/Source/Core/DiscIO/BannerLoader.cpp
+++ b/Source/Core/DiscIO/BannerLoader.cpp
@@ -8,7 +8,6 @@
#include "DiscIO/BannerLoaderGC.h"
#include "DiscIO/BannerLoaderWii.h"
#include "DiscIO/Filesystem.h"
-#include "DiscIO/VolumeCreator.h"
namespace DiscIO
{
@@ -18,7 +17,7 @@ class IVolume;
IBannerLoader* CreateBannerLoader(DiscIO::IFileSystem& _rFileSystem, DiscIO::IVolume *pVolume)
{
- if (IsVolumeWiiDisc(pVolume) || IsVolumeWadFile(pVolume))
+ if (pVolume->IsWiiDisc() || pVolume->IsWadFile())
return new CBannerLoaderWii(pVolume);
if (_rFileSystem.IsValid())
return new CBannerLoaderGC(_rFileSystem, pVolume);