From: RĂ©mi Denis-Courmont Date: Sun, 10 Aug 2008 12:16:23 +0000 (+0300) Subject: Fix previous commit X-Git-Tag: 0.9.0~491 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=502dcd58b74a29b6d5bb9fa938bcee4678d0c6e1;p=vlc Fix previous commit --- diff --git a/include/vlc_threads.h b/include/vlc_threads.h index 675a8ead77..df7107e68e 100644 --- a/include/vlc_threads.h +++ b/include/vlc_threads.h @@ -397,11 +397,11 @@ static inline int __vlc_cond_timedwait( const char * psz_file, int i_line, result = SignalObjectAndWait( *p_mutex, *p_condvar, delay, FALSE ); total -= delay; + vlc_mutex_lock (p_mutex); } while (total); /* Reacquire the mutex before returning. */ - vlc_mutex_lock( p_mutex ); if(result == WAIT_TIMEOUT) return ETIMEDOUT; /* this error is perfectly normal */