Factor and fix locking

diff --git a/src/control/playlist.c b/src/control/playlist.c
index 794c137d172a8caaeef7076f2b822b0eaddec4be..4f354addb36fb46e6b287f34e6c1df428fcfd044 100644 (file)
--- a/src/control/playlist.c
+++ b/src/control/playlist.c
@@ -81,21 +81,15 @@ void libvlc_playlist_play( libvlc_instance_t *p_instance, int i_id,
 
         p_item = playlist_ItemGetByInputId( PL, i_id,
                                             PL->p_root_category );
-        if( !p_item )
-        {
-            if( did_lock == 1 )
-            {
-                playlist_Unlock( PL );
-                playlist_mark_locked( p_instance, 0 );
-            }
+        if( p_item )
+            playlist_Control( PL, PLAYLIST_VIEWPLAY, pl_Locked,
+                              PL->p_root_category, p_item );
+       else
             RAISEVOID( "Unable to find item" );
-        }
 
-        playlist_Control( PL, PLAYLIST_VIEWPLAY, pl_Locked,
-                          PL->p_root_category, p_item );
         if( did_lock == 1 )
         {
-            playlist_Lock( PL );
+            playlist_Unlock( PL );
             playlist_mark_locked( p_instance, 0 );
         }
     }