Commit 9e48c559 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Allow pl_Hold from within pl_Deactivate

parent fc22ddf3
...@@ -80,10 +80,14 @@ void pl_Release( vlc_object_t *p_this ) ...@@ -80,10 +80,14 @@ void pl_Release( vlc_object_t *p_this )
void pl_Deactivate (libvlc_int_t *p_libvlc) void pl_Deactivate (libvlc_int_t *p_libvlc)
{ {
bool deactivate;
vlc_mutex_lock (&global_lock); vlc_mutex_lock (&global_lock);
if (libvlc_priv (p_libvlc)->playlist_active) deactivate = libvlc_priv (p_libvlc)->playlist_active;
playlist_Deactivate (libvlc_priv (p_libvlc)->p_playlist);
vlc_mutex_unlock (&global_lock); vlc_mutex_unlock (&global_lock);
if (deactivate)
playlist_Deactivate (libvlc_priv (p_libvlc)->p_playlist);
} }
void playlist_Lock( playlist_t *pl ) void playlist_Lock( playlist_t *pl )
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment