Skip to content

V
vlc
Commit 0f9541fa authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Do not check that playlist has an input twice 

(This does NOT fix the RC pause deadlock)
parent e7dfcd8d
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 10 deletions
src/playlist/control.c
View file @ 0f9541fa
...@@ -151,22 +151,21 @@ static int PlaylistVAControl( playlist_t * p_playlist, int i_query, va_list args ...@@ -151,22 +151,21 @@ static int PlaylistVAControl( playlist_t * p_playlist, int i_query, va_list args
break; break;
case PLAYLIST_PAUSE: case PLAYLIST_PAUSE:
if( pl_priv(p_playlist)->p_input && if( !pl_priv(p_playlist)->p_input )
var_GetInteger( pl_priv(p_playlist)->p_input, "state" ) == PAUSE_S ) { /* FIXME: is this really useful without input? */
pl_priv(p_playlist)->status.i_status = PLAYLIST_PAUSED;
break;
}
if( var_GetInteger( pl_priv(p_playlist)->p_input, "state" ) == PAUSE_S )
{ {
pl_priv(p_playlist)->status.i_status = PLAYLIST_RUNNING; pl_priv(p_playlist)->status.i_status = PLAYLIST_RUNNING;
if( pl_priv(p_playlist)->p_input ) var_SetInteger( pl_priv(p_playlist)->p_input, "state", PLAYING_S );
{
var_SetInteger( pl_priv(p_playlist)->p_input, "state", PLAYING_S );
}
} }
else else
{ {
pl_priv(p_playlist)->status.i_status = PLAYLIST_PAUSED; pl_priv(p_playlist)->status.i_status = PLAYLIST_PAUSED;
if( pl_priv(p_playlist)->p_input ) var_SetInteger( pl_priv(p_playlist)->p_input, "state", PAUSE_S );
{
var_SetInteger( pl_priv(p_playlist)->p_input, "state", PAUSE_S );
}
} }
break; break;
......
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