From f4b83283f3c7ee9a1d857d1ce19321de0196e685 Mon Sep 17 00:00:00 2001
From: Alyssa Milburn
Date: Sat, 25 Aug 2012 13:50:44 +0200
Subject: COMMON: Fix waiting for multiple coroutine events.

This fixes the bWaitAll case of waitForMultipleObjects, and also the
resetting of events later in the function.
---
 common/coroutines.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'common')

diff --git a/common/coroutines.cpp b/common/coroutines.cpp
index 9ef7c73e38..cb9e61cbc6 100644
--- a/common/coroutines.cpp
+++ b/common/coroutines.cpp
@@ -475,9 +475,9 @@ void CoroutineScheduler::waitForMultipleObjects(CORO_PARAM, int nCount, uint32 *
 			// Determine the signalled state
 			_ctx->pidSignalled = (_ctx->pProcess) || !_ctx->pEvent ? false : _ctx->pEvent->signalled;
 
-			if (bWaitAll && _ctx->pidSignalled)
+			if (bWaitAll && !_ctx->pidSignalled)
 				_ctx->signalled = false;
-			else if (!bWaitAll & _ctx->pidSignalled)
+			else if (!bWaitAll && _ctx->pidSignalled)
 				_ctx->signalled = true;
 		}
 
@@ -487,7 +487,7 @@ void CoroutineScheduler::waitForMultipleObjects(CORO_PARAM, int nCount, uint32 *
 			for (_ctx->i = 0; _ctx->i < nCount; ++_ctx->i) {
 				_ctx->pEvent = getEvent(pidList[_ctx->i]);
 
-				if (_ctx->pEvent->manualReset)
+				if (!_ctx->pEvent->manualReset)
 					_ctx->pEvent->signalled = false;
 			}
 
-- 
cgit v1.2.3