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

Merge pull request #203 from Sonicadvance1/fix-crash 

Fix a crash that got recently introduced.
This commit is contained in:
Ryan Houdek 2014-03-23 22:56:15 -05:00
parent 9849129b5d 5310d6d2ea
commit 94ceb4d305
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/DiscIO/FileMonitor.cpp
View File

@ -143,6 +143,9 @@ void FindFilename(u64 offset)
} }
const std::string filename = pFileSystem->GetFileName(offset); const std::string filename = pFileSystem->GetFileName(offset);
if (filename.empty())
return;
CheckFile(filename, pFileSystem->GetFileSize(filename)); CheckFile(filename, pFileSystem->GetFileSize(filename));
} }

2
Source/Core/DiscIO/FileSystemGCWii.cpp
View File

@ -60,7 +60,7 @@ const std::string CFileSystemGCWii::GetFileName(u64 _Address)
} }
} }
return nullptr; return "";
} }
u64 CFileSystemGCWii::ReadFile(const std::string& _rFullPath, u8* _pBuffer, size_t _MaxBufferSize) u64 CFileSystemGCWii::ReadFile(const std::string& _rFullPath, u8* _pBuffer, size_t _MaxBufferSize)