From: Laurent Aimar Date: Sat, 6 Sep 2008 14:52:20 +0000 (+0200) Subject: Fixed vlc_cond_wait for windows. X-Git-Tag: 1.0.0-pre1~3491 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=12e7640ee4a244ac96bb020e50ba16112b572054;p=vlc Fixed vlc_cond_wait for windows. Thanks Courmisch for pointing it. --- diff --git a/include/vlc_threads.h b/include/vlc_threads.h index 771f33232c..3afadfadf4 100644 --- a/include/vlc_threads.h +++ b/include/vlc_threads.h @@ -392,12 +392,12 @@ static inline void __vlc_cond_wait( const char * psz_file, int i_line, { vlc_testcancel (); result = SignalObjectAndWait (*p_mutex, *p_condvar, INFINITE, TRUE); - - /* Reacquire the mutex before returning. */ - vlc_mutex_lock( p_mutex ); } while (result == WAIT_IO_COMPLETION); + /* Reacquire the mutex before returning. */ + vlc_mutex_lock( p_mutex ); + vlc_testcancel (); (void)psz_file; (void)i_line;