]> git.sesse.net Git - vlc/commitdiff
Allow pl_Hold from within pl_Deactivate
authorRémi Denis-Courmont <remi@remlab.net>
Tue, 9 Feb 2010 16:24:40 +0000 (18:24 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Tue, 9 Feb 2010 16:24:40 +0000 (18:24 +0200)
src/playlist/control.c

index 3faa47293dd827cf268b578e93bde7f8a9270b7d..3ee0f5e06b727aaf8fe52d19b3b2c183fb858c46 100644 (file)
@@ -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 )