Commit 1e6d1086 authored by dionoea's avatar dionoea
Browse files

Keep p_input->i_state when adding a subtitle on the fly. This prevents i_state...

Keep p_input->i_state when adding a subtitle on the fly. This prevents i_state from being changed to BUFFERING_S (which would in turn prevent the input from being paused). This should close #1904. (Should be backported in 0.8.6 if we keep that branch)
parent f2460371
......@@ -2813,6 +2813,8 @@ bool input_AddSubtitles( input_thread_t *p_input, char *psz_subtitle,
vlc_value_t list;
char *psz_path, *psz_extension;
int i_state = p_input->i_state;
if( b_check_extension && !subtitles_Filter( psz_subtitle ) )
{
return false;
......@@ -2862,6 +2864,7 @@ bool input_AddSubtitles( input_thread_t *p_input, char *psz_subtitle,
}
var_Change( p_input, "spu-es", VLC_VAR_FREELIST, &list, NULL );
}
input_ChangeState( p_input, i_state );
}
else free( sub );
......
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