lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made the behaviour of Thread::Wait consistent across implementations when called from its owner thread

Browse source
This commit is contained in:
Laurent Gomila 2011-06-12 14:08:54 +02:00
parent b0ebca9d29
commit 48e30ea0e3
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/SFML/System/Win32/ThreadImpl.cpp
View file

@ -57,7 +57,12 @@ ThreadImpl::~ThreadImpl()
void ThreadImpl::Wait()
{
if (myThread)
WaitForSingleObject(myThread, INFINITE);
{
// The following condition avoids a deadlock if Wait() is called from its
// owner thread. This makes the behaviour consistent with the Unix implementation
if (GetThreadId(myThread) != GetCurrentThreadId())
WaitForSingleObject(myThread, INFINITE);
}
}