Changeset aba3de3334cfc9baba3ad296278e8071637b1d78

Show
Ignore:
Timestamp:
16/09/06 21:20:42 (2 years ago)
Author:
Clément Stenac <zorglub@videolan.org>
git-committer:
Clément Stenac <zorglub@videolan.org> 1158434442 +0000
git-parent:

[c510011287bb8dc1d37fd0860fba8caf06062469]

git-author:
Clément Stenac <zorglub@videolan.org> 1158434442 +0000
Message:

Correctly handle "no-skip" items

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • src/playlist/control.c

    r315069b raba3de3  
    274274    } 
    275275 
    276     if( !p_playlist->request.b_request && p_playlist->status.p_item && 
    277          p_playlist->status.p_item->i_flags & PLAYLIST_SKIP_FLAG ) 
    278     { 
    279         msg_Dbg( p_playlist, "blocking item, stopping") ; 
    280         return NULL; 
     276    if( !p_playlist->request.b_request && p_playlist->status.p_item ) 
     277    { 
     278        playlist_item_t *p_parent = p_playlist->status.p_item; 
     279        while( p_parent ) 
     280        { 
     281            if( p_parent->i_flags & PLAYLIST_SKIP_FLAG ) 
     282            { 
     283                msg_Dbg( p_playlist, "blocking item, stopping") ; 
     284                return NULL; 
     285            } 
     286            p_parent = p_parent->p_parent; 
     287        } 
    281288    } 
    282289