vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Wed May 17 
19:26:19 2017 +0300| [6446fe080c9f7ceff9dfe1600b42806e209f11b0] | committer: 
Rémi Denis-Courmont

events: work around recursive locking in playlist

Pending more involved proper fix in playlist side.

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

 src/misc/events.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/misc/events.c b/src/misc/events.c
index a0efbda6ad..6bf55268ed 100644
--- a/src/misc/events.c
+++ b/src/misc/events.c
@@ -66,7 +66,9 @@ typedef struct vlc_event_listener_t
 void vlc_event_manager_init( vlc_event_manager_t * p_em, void * p_obj )
 {
     p_em->p_obj = p_obj;
-    vlc_mutex_init( &p_em->lock );
+    /* This is an unsafe work-around for a long-standing playlist bug.
+     * Do not rely on this. */
+    vlc_mutex_init_recursive( &p_em->lock );
 
     for( size_t i = 0; i < ARRAY_SIZE(p_em->events); i++ )
        ARRAY_INIT( p_em->events[i].listeners );

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to