archive/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2025-07-02 13:01:18 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

coreinit: Make sure thread deallocation runs before join returns
Some checks failed
Generate translation template / generate-pot (push) Failing after 36s
Details
Build check / build (push) Has been cancelled
Details

Browse source 
Fixes crash in Coaster Crazy Deluxe
This commit is contained in:
Exzap 2025-06-22 23:34:14 +02:00
parent 4f4c9594ac
commit e91740cf29
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Cafe/OS/libs/coreinit/coreinit_Thread.cpp
View file

@ -717,7 +717,10 @@ namespace coreinit
thread->id = 0x8000; thread->id = 0x8000;
if (!thread->deallocatorFunc.IsNull()) if (!thread->deallocatorFunc.IsNull())
{
__OSQueueThreadDeallocation(thread); __OSQueueThreadDeallocation(thread);
PPCCore_switchToSchedulerWithLock(); // make sure the deallocation function runs before we return
}
__OSUnlockScheduler(); __OSUnlockScheduler();
@ -1525,7 +1528,7 @@ namespace coreinit
} }
// queue thread deallocation to run after current thread finishes // queue thread deallocation to run after current thread finishes
// the termination threads run at a higher priority on the same threads // the termination threads run at a higher priority on the same core
void __OSQueueThreadDeallocation(OSThread_t* thread) void __OSQueueThreadDeallocation(OSThread_t* thread)
{ {
uint32 coreIndex = OSGetCoreId(); uint32 coreIndex = OSGetCoreId();