libretro/Play-
1
0
Fork 0
mirror of https://github.com/libretro/Play-.git synced 2025-02-25 22:15:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle case when SetupThread is called on an already setup thread.

Browse Source
This commit is contained in:
Jean-Philip Desjardins 2018-10-01 13:05:56 -04:00
parent b6623e4a0c
commit 4f7f899443
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/ee/PS2OS.cpp
View File

@ -2313,7 +2313,20 @@ void CPS2OS::sc_SetupThread()
*reinterpret_cast<uint32*>(m_ram + argsPtrs + (argsCount * 4)) = 0;
}
uint32 threadId = m_threads.Allocate();
uint32 threadId = -1;
if(
(m_currentThreadId == 0) ||
(m_currentThreadId == m_idleThreadId))
{
//No thread has been started, spawn a new thread
threadId = m_threads.Allocate();
}
else
{
//Re-use the calling thread (needed by 007: Nightfire)
threadId = m_currentThreadId;
UnlinkThread(threadId);
}
assert(static_cast<int32>(threadId) != -1);
//Set up the main thread
@ -2327,7 +2340,6 @@ void CPS2OS::sc_SetupThread()
thread->contextPtr = 0;
LinkThread(threadId);
assert(m_currentThreadId == 0);
m_currentThreadId = threadId;
m_ee.m_State.nGPR[SC_RETURN].nV[0] = stackAddr;