[vlc-devel] commit: Fix previous commit ( Rémi Denis-Courmont )

git version control git at videolan.org
Sun Aug 10 14:13:38 CEST 2008


vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sun Aug 10 15:16:23 2008 +0300| [502dcd58b74a29b6d5bb9fa938bcee4678d0c6e1] | committer: Rémi Denis-Courmont 

Fix previous commit

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=502dcd58b74a29b6d5bb9fa938bcee4678d0c6e1
---

 include/vlc_threads.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index 675a8ea..df7107e 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 */
 




More information about the vlc-devel mailing list