[vlc-commits] playlist: move input-current, fix race

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Mar 19 20:10:12 2015 +0200| [7295d429681ebe4126bda12af616ecd2051fb35c] | committer: Rémi Denis-Courmont

playlist: move input-current, fix race

See also a6b259b733a0ba0c064377cf07b5bd0c33584b17.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7295d429681ebe4126bda12af616ecd2051fb35c
---

 src/playlist/thread.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/playlist/thread.c b/src/playlist/thread.c
index 12a452d..95d734e 100644
--- 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;