Fix multi-threading crashes on shutdown with Linux and Blackberry. Fi…

…xes issue #3133 -- thanks @unknown
hrydgard · Oct 17, 2013 · fafe4fc · fafe4fc
1 parent 4f6b022
commit fafe4fc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/Core/HLE/sceIo.cpp b/Core/HLE/sceIo.cpp
@@ -469,6 +469,7 @@ void __IoInit() {
 	if (ioManagerThreadEnabled) {
 		Core_ListenShutdown(&__IoWakeManager);
 		ioManagerThread = new std::thread(&__IoManagerThread);
+		ioManagerThread->detach();
 	}
 
 	__KernelRegisterWaitTypeFuncs(WAITTYPE_ASYNCIO, __IoAsyncBeginCallback, __IoAsyncEndCallback);

diff --git a/Core/System.cpp b/Core/System.cpp
@@ -293,6 +293,7 @@ bool PSP_Init(const CoreParameter &coreParam, std::string *error_string) {
 		Core_ListenShutdown(System_Wake);
 		CPU_SetState(CPU_THREAD_PENDING);
 		cpuThread = new std::thread(&CPU_RunLoop);
+		cpuThread->detach();
 		CPU_WaitStatus(cpuThreadReplyCond, &CPU_IsReady);
 	} else {
 		CPU_Init();