playlist: move input-current, fix race

See also a6b259b733a0ba0c064377cf07b5bd0c33584b17.

diff --git a/src/playlist/thread.c b/src/playlist/thread.c
index 12a452d67cf247e243b78baeadc0a488efe40687..95d734ef9d157f371a6d897cd0d6402ab9658406 100644 (file)
--- a/src/playlist/thread.c
+++ b/src/playlist/thread.c
@@ -221,8 +221,6 @@ static bool PlayItem( playlist_t *p_playlist, playlist_item_t *p_item )
         }
     }
 
-    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 */
@@ -240,6 +238,7 @@ static bool PlayItem( playlist_t *p_playlist, playlist_item_t *p_item )
     PL_UNLOCK;
 
     var_TriggerCallback( p_playlist, "activity" );
+    var_SetAddress( p_playlist, "input-current", p_input_thread );
 
     PL_LOCK;
     return p_input_thread != NULL;