dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r26353) -Fix (r26349) [FS#5917]: Win32 and OS/2 ThreadMutex::WaitForSignal always asserted.

Browse Source
This commit is contained in:
frosch
2014-02-18 17:58:46 +00:00
parent b3366d51d8
commit 3a9034e74f
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/thread/thread_os2.cpp
View File

@@ -128,12 +128,9 @@ public:
/* virtual */ void WaitForSignal()
{
assert(this->recursive_count == 1); // Do we need to call Begin/EndCritical multiple times otherwise?
uint old_recursive_count = this->recursive_count;
this->recursive_count = 0;
this->EndCritical();
DosWaitEventSem(event, SEM_INDEFINITE_WAIT);
this->BeginCritical();
this->recursive_count = old_recursive_count;
}
/* virtual */ void SendSignal()

3
src/thread/thread_win32.cpp
View File

@@ -141,12 +141,9 @@ public:
/* virtual */ void WaitForSignal()
{
assert(this->recursive_count == 1); // Do we need to call Begin/EndCritical multiple times otherwise?
uint old_recursive_count = this->recursive_count;
this->recursive_count = 0;
this->EndCritical();
WaitForSingleObject(this->event, INFINITE);
this->BeginCritical();
this->recursive_count = old_recursive_count;
}
/* virtual */ void SendSignal()