Qt: fix a deadlock in the information panel.

[vlc] / modules / control / rc.c

diff --git a/modules/control/rc.c b/modules/control/rc.c
index c78fd9c180aa795f9c1811b857293ae1ac897bea..8b3b8d6583bdf48956e1b7231513e08e645a17d6 100644 (file)
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -1417,7 +1417,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
             p_item = p_parent = p_playlist->items.p_elems[i_pos*2-1];
             while( p_parent->p_parent )
                 p_parent = p_parent->p_parent;
-            playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true,
+            playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Unlocked,
                     p_parent, p_item );
         }
         else
@@ -1430,7 +1430,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
     else if( !strcmp( psz_cmd, "clear" ) )
     {
         playlist_Stop( p_playlist );
-        playlist_Clear( p_playlist, false );
+        playlist_Clear( p_playlist, pl_Unlocked );
     }
     else if( !strcmp( psz_cmd, "add" ) &&
              newval.psz_string && *newval.psz_string )
@@ -1442,7 +1442,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
             msg_rc( "Trying to add %s to playlist.", newval.psz_string );
             int i_ret =playlist_AddInput( p_playlist, p_item,
                      PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END, true,
-                     false );
+                     pl_Unlocked );
             vlc_gc_decref( p_item );
             if( i_ret != VLC_SUCCESS )
             {
@@ -1460,7 +1460,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
             msg_rc( "trying to enqueue %s to playlist", newval.psz_string );
             if( playlist_AddInput( p_playlist, p_item,
                                PLAYLIST_APPEND, PLAYLIST_END, true,
-                               false ) != VLC_SUCCESS )
+                               pl_Unlocked ) != VLC_SUCCESS )
             {
                 return VLC_EGENERIC;
             }