From 674334f53e839fb0fbcb48d4e8aaa7d9fb121987 Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Fri, 11 Sep 2009 06:55:43 +0000 Subject: [PATCH] fix loading wads on both windows (FileMonitor.cpp) and linux/mac (std::transform toupper not sure why it was there :/) fixes issue 1388. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4253 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DiscIO/Src/FileMonitor.cpp | 2 +- Source/Core/DiscIO/Src/NANDContentLoader.cpp | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Source/Core/DiscIO/Src/FileMonitor.cpp b/Source/Core/DiscIO/Src/FileMonitor.cpp index 491042c3c8..5bf60e53cf 100644 --- a/Source/Core/DiscIO/Src/FileMonitor.cpp +++ b/Source/Core/DiscIO/Src/FileMonitor.cpp @@ -80,7 +80,7 @@ void ReadGC(std::string FileName) GCFiles.clear(); OpenISO = DiscIO::CreateVolumeFromFilename(FileName); if (!OpenISO) return; - if (!DiscIO::IsVolumeWiiDisc(OpenISO)) + if (!DiscIO::IsVolumeWiiDisc(OpenISO) && !DiscIO::IsVolumeWadFile(OpenISO)) { pFileSystem = DiscIO::CreateFileSystem(OpenISO); pFileSystem->GetFileList(GCFiles); diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.cpp b/Source/Core/DiscIO/Src/NANDContentLoader.cpp index 9fd7d1afc5..93fd9458f3 100644 --- a/Source/Core/DiscIO/Src/NANDContentLoader.cpp +++ b/Source/Core/DiscIO/Src/NANDContentLoader.cpp @@ -364,10 +364,6 @@ const INANDContentLoader& CNANDContentManager::GetNANDLoader(const std::string& { std::string KeyString(_rName); - std::transform(KeyString.begin(), KeyString.end(), KeyString.begin(), - (int(*)(int)) toupper); - - CNANDContentMap::iterator itr = m_Map.find(KeyString); if (itr != m_Map.end()) return *itr->second;