From d497401e3a6ac8c669f91dc64300bee224154118 Mon Sep 17 00:00:00 2001 From: Laurent Gomila Date: Tue, 14 Jun 2011 08:09:32 +0200 Subject: [PATCH] Reverted changes in the Win32/ThreadImpl (didn't compile on MinGW and Windows < Vista) --- src/SFML/System/Win32/ThreadImpl.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/SFML/System/Win32/ThreadImpl.cpp b/src/SFML/System/Win32/ThreadImpl.cpp index 56832fdb..cc1ff653 100644 --- a/src/SFML/System/Win32/ThreadImpl.cpp +++ b/src/SFML/System/Win32/ThreadImpl.cpp @@ -57,12 +57,7 @@ ThreadImpl::~ThreadImpl() void ThreadImpl::Wait() { if (myThread) - { - // 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); - } + WaitForSingleObject(myThread, INFINITE); }