make vlc_object_timedwait() return immediately if the object or libvlc is dying

diff --git a/src/misc/objects.c b/src/misc/objects.c
index 79a64d203bc75c6ce5f5e25531631491a2c6ca12..31e5133dd1e07b1cec6ec6ed9533347f9751a864 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -545,6 +545,8 @@ int __vlc_object_timedwait( vlc_object_t *obj, mtime_t deadline )
     int v;
 
     vlc_assert_locked( &obj->object_lock );
+    if( obj->b_die || obj->p_libvlc->b_die )
+        return -1; /* don't wait if we are dying */
     v = vlc_cond_timedwait( &obj->object_wait, &obj->object_lock, deadline );
     if( v == 0 ) /* signaled */
         return obj->b_die ? -1 : 1;