ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

win32: avoid deadlock if waiting for current thread. La Keyboard input

This commit is contained in:
Flyinghead 2020-04-02 11:51:39 +02:00
parent ca3c2a2387
commit 578071e8f9
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/nullDC.cpp
View File

@ -386,7 +386,8 @@ void LoadSpecialSettings()
settings.input.JammaSetup = JVS::WorldKicksPCB;
}
else if (!strcmp("THE TYPING OF THE DEAD", naomi_game_id)
|| !strcmp(" LUPIN THE THIRD -THE TYPING-", naomi_game_id))
|| !strcmp(" LUPIN THE THIRD -THE TYPING-", naomi_game_id)
|| !strcmp("------La Keyboardxyu------", naomi_game_id))
{
INFO_LOG(BOOT, "Enabling keyboard for game %s", naomi_game_id);
settings.input.JammaSetup = JVS::Keyboard;

3
core/stdclass.cpp
View File

@ -167,7 +167,8 @@ void cThread::Start() {
ResumeThread(hThread);
}
void cThread::WaitToEnd() {
WaitForSingleObject(hThread,INFINITE);
if (GetCurrentThreadId() != GetThreadId(hThread))
WaitForSingleObject(hThread, INFINITE);
CloseHandle(hThread);
hThread = NULL;
}