thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Font: Prevent crash on game exit.

Browse source 
We should not try to call __KernelDirectMipsCall() on shutdown.
This commit is contained in:
Unknown W. Brackets 2020-03-21 12:36:09 -07:00
parent d734f7ccb4
commit 000a166dba
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Core/HLE/sceFont.cpp
View file

@ -511,7 +511,9 @@ public:
u32 args[2] = { params_.userDataAddr, (u32)handle_ };
// TODO: The return value of this is leaking.
if (handle_) { // Avoid calling free-callback on double-free
__KernelDirectMipsCall(params_.freeFuncAddr, 0, args, 2, false);
if (coreState != CORE_POWERDOWN) {
__KernelDirectMipsCall(params_.freeFuncAddr, 0, args, 2, false);
}
}
handle_ = 0;
fonts_.clear();
@ -628,7 +630,7 @@ public:
for (size_t i = 0; i < fonts_.size(); i++) {
if (fonts_[i] == font->Handle()) {
isfontopen_[i] = 0;
if (openAllocatedAddresses_[i] != 0) {
if (openAllocatedAddresses_[i] != 0 && coreState != CORE_POWERDOWN) {
u32 args[2] = { userDataAddr(), openAllocatedAddresses_[i] };
__KernelDirectMipsCall(freeFuncAddr(), 0, args, 2, true);
openAllocatedAddresses_[i] = 0;
@ -641,7 +643,7 @@ public:
}
void flushFont() {
if (charInfoBitmapAddress_ != 0) {
if (charInfoBitmapAddress_ != 0 && coreState != CORE_POWERDOWN) {
u32 args[2] = { userDataAddr(), charInfoBitmapAddress_ };
__KernelDirectMipsCall(freeFuncAddr(), 0, args, 2, true);
charInfoBitmapAddress_ = 0;