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

Restore proper functionality of events and thread waits. The arbitrary 5 sec timeout ( ??? ) broke stepping in the debugger. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2397 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard 2009-02-23 20:52:52 +00:00
parent 96827d9996
commit 042034f199
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Common/Src/Thread.cpp
View File

@ -91,7 +91,7 @@ void Thread::WaitForDeath()
{ {
if (m_hThread) if (m_hThread)
{ {
WaitForSingleObject(m_hThread, THREAD_WAIT_TIMEOUT); WaitForSingleObject(m_hThread, INFINITE);
CloseHandle(m_hThread); CloseHandle(m_hThread);
m_hThread = NULL; m_hThread = NULL;
} }
@ -140,7 +140,7 @@ void Event::Set()
void Event::Wait() void Event::Wait()
{ {
WaitForSingleObject(m_hEvent, THREAD_WAIT_TIMEOUT); WaitForSingleObject(m_hEvent, INFINITE);
} }
inline HRESULT MsgWaitForSingleObject(HANDLE handle, DWORD timeout) inline HRESULT MsgWaitForSingleObject(HANDLE handle, DWORD timeout)

1
Source/Core/Common/Src/Thread.h
View File

@ -81,7 +81,6 @@ private:
#ifdef _WIN32 #ifdef _WIN32
HANDLE m_hThread; HANDLE m_hThread;
DWORD m_threadId; DWORD m_threadId;
static const int THREAD_WAIT_TIMEOUT = 5000;
#else #else
pthread_t thread_id; pthread_t thread_id;
#endif #endif