From 9e48c5596b5e7caf9c7257f459c2c5a5b89abe6d Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Tue, 9 Feb 2010 18:24:40 +0200 Subject: [PATCH] Allow pl_Hold from within pl_Deactivate --- src/playlist/control.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/playlist/control.c b/src/playlist/control.c index 3faa47293d..3ee0f5e06b 100644 --- a/src/playlist/control.c +++ b/src/playlist/control.c @@ -80,10 +80,14 @@ void pl_Release( vlc_object_t *p_this ) void pl_Deactivate (libvlc_int_t *p_libvlc) { + bool deactivate; + vlc_mutex_lock (&global_lock); - if (libvlc_priv (p_libvlc)->playlist_active) - playlist_Deactivate (libvlc_priv (p_libvlc)->p_playlist); + deactivate = libvlc_priv (p_libvlc)->playlist_active; vlc_mutex_unlock (&global_lock); + + if (deactivate) + playlist_Deactivate (libvlc_priv (p_libvlc)->p_playlist); } void playlist_Lock( playlist_t *pl ) -- 2.39.2