Commit 16c3c8d5 authored by Cyril Deguet's avatar Cyril Deguet

* src/playlist/playlist.c: check "prevent-skip" to avoid skipping

 twice after a "goto" or a "skip" command.
 I don't know if it is the proper fix, but at least the playlist is
 useable now ;)
parent f1579f90
...@@ -239,6 +239,8 @@ void playlist_Command( playlist_t * p_playlist, playlist_command_t i_command, ...@@ -239,6 +239,8 @@ void playlist_Command( playlist_t * p_playlist, playlist_command_t i_command,
{ {
input_StopThread( p_playlist->p_input ); input_StopThread( p_playlist->p_input );
} }
val.b_bool = VLC_TRUE;
var_Set( p_playlist, "prevent-skip", val );
p_playlist->i_status = PLAYLIST_RUNNING; p_playlist->i_status = PLAYLIST_RUNNING;
break; break;
...@@ -363,9 +365,16 @@ static void RunThread ( playlist_t *p_playlist ) ...@@ -363,9 +365,16 @@ static void RunThread ( playlist_t *p_playlist )
p_playlist->i_status = PLAYLIST_RUNNING; p_playlist->i_status = PLAYLIST_RUNNING;
} }
/* Select the next playlist item */ /* Select the next playlist item if necessary */
vlc_mutex_lock( &p_playlist->object_lock ); vlc_mutex_lock( &p_playlist->object_lock );
SkipItem( p_playlist, 1 ); var_Get( p_playlist, "prevent-skip", &val );
if( val.b_bool == VLC_FALSE )
{
SkipItem( p_playlist, 1 );
}
/* Reset forced status */
val.b_bool = VLC_FALSE;
var_Set( p_playlist, "prevent-skip", val );
vlc_mutex_unlock( &p_playlist->object_lock ); vlc_mutex_unlock( &p_playlist->object_lock );
continue; continue;
......
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