playlist: set "input-current" to NULL when appropriate

diff --git a/src/playlist/thread.c b/src/playlist/thread.c
index ea96549105902f5f065c2835622e0e27648f7bfe..8e7b08297462eb6d9c590a0539cf04d7e0500d5f 100644 (file)
--- a/src/playlist/thread.c
+++ b/src/playlist/thread.c
@@ -223,10 +223,10 @@ static void PlayItem( playlist_t *p_playlist, playlist_item_t *p_item )
             vlc_object_release( p_input_thread );
             p_input_thread = NULL;
         }
-        else
-            var_SetAddress( p_playlist, "input-current", p_input_thread );
     }
 
+    var_SetAddress( p_playlist, "input-current", p_input_thread );
+
     /* TODO store art policy in playlist private data */
     char *psz_arturl = input_item_GetArtURL( p_input );
     /* p_input->p_meta should not be null after a successful CreateThread */
@@ -446,6 +446,8 @@ static void LoopInput( playlist_t *p_playlist )
         PL_DEBUG( "dead input" );
         PL_UNLOCK;
 
+        var_SetAddress( p_playlist, "input-current", NULL );
+
         /* WARNING: Input resource manipulation and callback deletion are
          * incompatible with the playlist lock. */
         if( !var_InheritBool( p_input, "sout-keep" ) )