Skip to content

V
vlc
Commit aba3de33 authored by Clément Stenac's avatar Clément Stenac
Browse files
Options

Correctly handle "no-skip" items

parent c5100112
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 4 deletions
src/playlist/control.c
View file @ aba3de33
...@@ -273,12 +273,19 @@ playlist_item_t * playlist_NextItem( playlist_t *p_playlist ) ...@@ -273,12 +273,19 @@ playlist_item_t * playlist_NextItem( playlist_t *p_playlist )
return NULL; return NULL;
} }
if( !p_playlist->request.b_request && p_playlist->status.p_item && if( !p_playlist->request.b_request && p_playlist->status.p_item )
p_playlist->status.p_item->i_flags & PLAYLIST_SKIP_FLAG ) {
playlist_item_t *p_parent = p_playlist->status.p_item;
while( p_parent )
{
if( p_parent->i_flags & PLAYLIST_SKIP_FLAG )
{ {
msg_Dbg( p_playlist, "blocking item, stopping") ; msg_Dbg( p_playlist, "blocking item, stopping") ;
return NULL; return NULL;
} }
p_parent = p_parent->p_parent;
}
}
/* Random case. This is an exception: if request, but request is skip +- 1 /* Random case. This is an exception: if request, but request is skip +- 1
* we don't go to next item but select a new random one. */ * we don't go to next item but select a new random one. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment