MapleShrine
/
mkxp
1
0
Fork 0
Code Issues 32 Pull Requests 11 Projects Releases Wiki Activity

MRI: Actually throw ENOENT for missing files #137

Open
mook wants to merge 1 commits from mook/filesystem-enoent into master
pull from: mook/filesystem-enoent
merge into: MapleShrine:master
Conversation 5 Commits 1 Files Changed 1 +14 -1
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/filesystem.cpp
View File

@ -650,7 +650,20 @@ void FileSystem::openReadRaw(SDL_RWops &ops,
bool freeOnClose) bool freeOnClose)
{ {
PHYSFS_File *handle = PHYSFS_openRead(filename); PHYSFS_File *handle = PHYSFS_openRead(filename);
assert(handle);
if (!handle)
{
PHYSFS_ErrorCode error = PHYSFS_getLastErrorCode();
switch (error)
{
case PHYSFS_ERR_NOT_FOUND:
case PHYSFS_ERR_NOT_A_FILE:
throw Exception(Exception::NoFileError, "%s", filename);
default:
throw Exception(Exception::PHYSFSError,
"PhysFS: %s", PHYSFS_getErrorByCode(error));
}
}
initReadOps(handle, ops, freeOnClose); initReadOps(handle, ops, freeOnClose);
} }