[vlc-commits] playlist: Set the playlist input thread before triggering a callback

[Jonas Lundqvist]

vlc | branch: master | Jonas Lundqvist <jonas at gannon.se> | Thu Feb 19 12:39:06 2015 +0000| [a6b259b733a0ba0c064377cf07b5bd0c33584b17] | committer: Jean-Baptiste Kempf

playlist: Set the playlist input thread before triggering a callback

Close #13972

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 src/playlist/thread.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/playlist/thread.c b/src/playlist/thread.c
index b865af8..12a452d 100644
--- a/src/playlist/thread.c
+++ b/src/playlist/thread.c
@@ -235,10 +235,13 @@ static bool PlayItem( playlist_t *p_playlist, playlist_item_t *p_item )
     }
     free( psz_arturl );
 
+    PL_LOCK;
+    p_sys->p_input = p_input_thread;
+    PL_UNLOCK;
+
     var_TriggerCallback( p_playlist, "activity" );
 
     PL_LOCK;
-    p_sys->p_input = p_input_thread;
     return p_input_thread != NULL;
 }