Don't wait for signal if the object is already dying.

[vlc] / include / vlc_objects.h

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index bbf3121601ef0498c923c1ae01ecafda07f73ef4..348e56d0f759990ca2d2a9663f057d9714402aae 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -159,7 +159,7 @@ vlc_bool_t __vlc_object_lock_and_wait( vlc_object_t *obj )
     vlc_bool_t b;
 
     vlc_object_lock( obj );
-    b = vlc_object_wait( obj );
+    b = obj->b_die ? VLC_TRUE : vlc_object_wait( obj );
     vlc_object_unlock( obj );
     return b;
 }