diff options
| author | LPFaint99 <lpfaint99@gmail.com> | 2009-09-11 06:55:43 +0000 |
|---|---|---|
| committer | LPFaint99 <lpfaint99@gmail.com> | 2009-09-11 06:55:43 +0000 |
| commit | 674334f53e839fb0fbcb48d4e8aaa7d9fb121987 (patch) | |
| tree | 291a55db2b79cc23b45c4d34666564dc5c11e511 /Source/Core | |
| parent | e1a0f8884a0a7adff476b770da97842ed2e89d9f (diff) | |
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
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DiscIO/Src/FileMonitor.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DiscIO/Src/NANDContentLoader.cpp | 4 |
2 files changed, 1 insertions, 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; |