[vlc-devel] commit: Allow pl_Hold from within pl_Deactivate ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Feb  9 18:24:40 2010 +0200| [9e48c5596b5e7caf9c7257f459c2c5a5b89abe6d] | committer: Rémi Denis-Courmont 

Allow pl_Hold from within pl_Deactivate

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

 src/playlist/control.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/playlist/control.c b/src/playlist/control.c
index 3faa472..3ee0f5e 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 )