Fix #1487 - race condition

[vlc] / src / playlist / engine.c

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index f39f60355ac6582e58dd205ffeb665b23dda1315..5e0cecd74d960f0c38df670d51fbbfa71fedaf52 100644 (file)
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -352,7 +352,9 @@ check_input:
          *  - Request, running requested -> start new item
          *  - Request, stopped requested -> collect garbage
         */
-        if( p_playlist->request.i_status != PLAYLIST_STOPPED )
+        int i_status = p_playlist->request.b_request ?
+            p_playlist->request.i_status : p_playlist->status.i_status;
+        if( i_status != PLAYLIST_STOPPED )
         {
             msg_Dbg( p_playlist, "starting new item" );
             p_item = playlist_NextItem( p_playlist );