Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #918 from unknownbrackets/fonts

Browse source 
Fix font crash on close again
This commit is contained in:
Henrik Rydgård 2013-03-09 02:15:14 -08:00
commit 03e8ee3d52
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Core/HLE/sceFont.cpp
View file

@ -190,7 +190,7 @@ public:
: fontLibID_(fontLibID), font_(font), handle_(handle) {}
Font *GetFont() { return font_; }
FontLib *GetFontLib() { return fontLibList[fontLibID_]; }
FontLib *GetFontLib() { if (!IsOpen()) return NULL; return fontLibList[fontLibID_]; }
u32 Handle() const { return handle_; }
bool IsOpen() const { return fontLibID_ != (u32)-1; }
@ -270,8 +270,8 @@ public:
if (false) {
// This fails in dissidia. The function at 088ff320 (params_.allocFuncAddr) calls some malloc function, the second one returns 0 which causes
// bad stores later. So we just ignore this with if (false) and fake it.
u32 args[1] = { allocSize };
__KernelDirectMipsCall(params_.allocFuncAddr, action, args, 1, false);
u32 args[2] = { params_.userDataAddr, allocSize };
__KernelDirectMipsCall(params_.allocFuncAddr, action, args, 2, false);
} else {
AllocDone(fakeAlloc_);
fakeAlloc_ += allocSize;
@ -296,8 +296,8 @@ public:
fontMap.erase(fonts_[i]);
}
}
u32 args[1] = { (u32)handle_ };
__KernelDirectMipsCall(params_.freeFuncAddr, 0, args, 1, false);
u32 args[2] = { params_.userDataAddr, (u32)handle_ };
__KernelDirectMipsCall(params_.freeFuncAddr, 0, args, 2, false);
handle_ = 0;
fonts_.clear();
isfontopen_.clear();