From: Rémi Denis-Courmont <remi@remlab.net>
Date: Tue, 9 Feb 2010 16:24:40 +0000 (+0200)
Subject: Allow pl_Hold from within pl_Deactivate
X-Git-Tag: 1.1.0-ff~254
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=9e48c5596b5e7caf9c7257f459c2c5a5b89abe6d;p=vlc

Allow pl_Hold from within pl_Deactivate
---

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 )