]> git.sesse.net Git - vlc/commitdiff
Fix previous commit
authorRémi Denis-Courmont <rdenis@simphalempin.com>
Sun, 10 Aug 2008 12:16:23 +0000 (15:16 +0300)
committerRémi Denis-Courmont <rdenis@simphalempin.com>
Sun, 10 Aug 2008 12:16:23 +0000 (15:16 +0300)
include/vlc_threads.h

index 675a8ead77676f33cc7c2146332cda8278bbe615..df7107e68e8c66de745660c4e8e48c49232784a8 100644 (file)
@@ -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 */