ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
LPFaint99 2009-09-11 06:55:43 +00:00
parent e1a0f8884a
commit 674334f53e
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DiscIO/Src/FileMonitor.cpp
View File

@ -80,7 +80,7 @@ void ReadGC(std::string FileName)
GCFiles.clear(); GCFiles.clear();
OpenISO = DiscIO::CreateVolumeFromFilename(FileName); OpenISO = DiscIO::CreateVolumeFromFilename(FileName);
if (!OpenISO) return; if (!OpenISO) return;
if (!DiscIO::IsVolumeWiiDisc(OpenISO)) if (!DiscIO::IsVolumeWiiDisc(OpenISO) && !DiscIO::IsVolumeWadFile(OpenISO))
{ {
pFileSystem = DiscIO::CreateFileSystem(OpenISO); pFileSystem = DiscIO::CreateFileSystem(OpenISO);
pFileSystem->GetFileList(GCFiles); pFileSystem->GetFileList(GCFiles);

4
Source/Core/DiscIO/Src/NANDContentLoader.cpp
View File

@ -364,10 +364,6 @@ const INANDContentLoader& CNANDContentManager::GetNANDLoader(const std::string&
{ {
std::string KeyString(_rName); std::string KeyString(_rName);
std::transform(KeyString.begin(), KeyString.end(), KeyString.begin(),
(int(*)(int)) toupper);
CNANDContentMap::iterator itr = m_Map.find(KeyString); CNANDContentMap::iterator itr = m_Map.find(KeyString);
if (itr != m_Map.end()) if (itr != m_Map.end())
return *itr->second; return *itr->second;