Merged changes

Former-commit-id: 3431062688bcc29574e7611391d8cd356d484e9b
2013-01-06 00:21:49 +01:00
parent c93e8eb585 78b6874d08
commit d177971810
8 changed files with 33 additions and 27 deletions
--- a/src/Nazara/Core/Posix/ConditionVariableImpl.cpp
+++ b/src/Nazara/Core/Posix/ConditionVariableImpl.cpp
@@ -28,7 +28,7 @@ void NzConditionVariableImpl::SignalAll()

 void NzConditionVariableImpl::Wait(NzMutexImpl* mutex)
 {
-	pthread_cond_wait(&m_cv, mutex);
+	pthread_cond_wait(&m_cv, &mutex->m_handle);
 }

 bool NzConditionVariableImpl::Wait(NzMutexImpl* mutex, nzUInt32 timeout)