Fix #1487 - race condition

diff --git a/src/playlist/control.c b/src/playlist/control.c
index d07f5d140e5b88b5705ee7457a661f6b37f57015..bbaa74b0c4cff610d38ef149164dd7ed4b7503e7 100644 (file)
--- a/src/playlist/control.c
+++ b/src/playlist/control.c
@@ -437,6 +437,7 @@ playlist_item_t * playlist_NextItem( playlist_t *p_playlist )
                                    p_playlist->status.p_item );
 
         p_playlist->i_current_index++;
+        assert( p_playlist->i_current_index <= p_playlist->current.i_size );
         if( p_playlist->i_current_index == p_playlist->current.i_size )
         {
             if( !b_loop || p_playlist->current.i_size == 0 ) return NULL;

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 );