Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverted changes in the Win32/ThreadImpl (didn't compile on MinGW and Windows < Vista)

Browse Source
This commit is contained in:
Laurent Gomila 2011-06-14 08:09:32 +02:00
parent e065b95db6
commit d497401e3a
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,12 +57,7 @@ ThreadImpl::~ThreadImpl()
void ThreadImpl::Wait() void ThreadImpl::Wait()
{ {
if (myThread) 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);
}
} }