@@ -1,8 +1,8 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 - * Jonathan Schleifer + * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 + * Jonathan Schleifer * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in @@ -167,49 +167,42 @@ } bool of_condition_wait(of_condition_t *condition, of_mutex_t *mutex) { + DWORD status; + if (!of_mutex_unlock(mutex)) return false; of_atomic_int_inc(&condition->count); - - if (WaitForSingleObject(condition->event, INFINITE) != WAIT_OBJECT_0) { - of_mutex_lock(mutex); - return false; - } - + status = WaitForSingleObject(condition->event, INFINITE); of_atomic_int_dec(&condition->count); if (!of_mutex_lock(mutex)) return false; - return true; + return (status == WAIT_OBJECT_0); } bool of_condition_timed_wait(of_condition_t *condition, of_mutex_t *mutex, of_time_interval_t timeout) { + DWORD status; + if (!of_mutex_unlock(mutex)) return false; of_atomic_int_inc(&condition->count); - - if (WaitForSingleObject(condition->event, timeout * 1000) != - WAIT_OBJECT_0) { - of_mutex_lock(mutex); - return false; - } - + status = WaitForSingleObject(condition->event, timeout * 1000); of_atomic_int_dec(&condition->count); if (!of_mutex_lock(mutex)) return false; - return true; + return (status == WAIT_OBJECT_0); } bool of_condition_free(of_condition_t *condition) {