Merge tag 'v0.19.17'

release v0.19.17
This commit is contained in:
Max Kellermann
2016-07-09 00:46:09 +02:00
15 changed files with 221 additions and 122 deletions

View File

@@ -301,7 +301,8 @@ decoder_check_cancel_read(const Decoder *decoder)
/* ignore the SEEK command during initialization, the plugin
should handle that after it has initialized successfully */
if (dc.command == DecoderCommand::SEEK &&
(dc.state == DecoderState::START || decoder->seeking))
(dc.state == DecoderState::START || decoder->seeking ||
decoder->initial_seek_running))
return false;
return true;