From ace060748b572063b33acee13c19000783a6cdde Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sat, 17 Jan 2015 13:21:02 +0100 Subject: Don't read from disk when checking volume type Should be faster than relying on the OS to cache the magic words. Also gets rid of the odd recursive call in VolumeDirectory. --- Source/Core/DiscIO/BannerLoader.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Source/Core/DiscIO/BannerLoader.cpp') 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); -- cgit v1.2.3