diff options
| author | Max Kellermann <max@duempel.org> | 2009-12-27 20:10:45 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-12-27 20:10:45 +0100 |
| commit | 333e11d0ebb255a2cd04cfde805e68f257b8a2f5 (patch) | |
| tree | 33f76a9fee04cdbe0aee7ec1956dbe35a8b7635f /src/decoder_api.c | |
| parent | 58da24b1cb685b5235dc5a528651b96a35b5b5bf (diff) | |
| parent | b1cc760aa5d99f726f52b4c17e06a9f72a0ef58a (diff) | |
| download | mpd-333e11d0ebb255a2cd04cfde805e68f257b8a2f5.tar.gz mpd-333e11d0ebb255a2cd04cfde805e68f257b8a2f5.tar.xz mpd-333e11d0ebb255a2cd04cfde805e68f257b8a2f5.zip | |
Merged release 0.15.7 from branch 'v0.15.x'
Conflicts:
NEWS
configure.ac
src/decoder_api.c
Diffstat (limited to 'src/decoder_api.c')
| -rw-r--r-- | src/decoder_api.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/decoder_api.c b/src/decoder_api.c index 704f6dbf7..e902c454a 100644 --- a/src/decoder_api.c +++ b/src/decoder_api.c @@ -107,7 +107,9 @@ decoder_command_finished(struct decoder *decoder) dc->seek_error || decoder->seeking); assert(dc->pipe != NULL); - if (dc->command == DECODE_COMMAND_SEEK) { + if (decoder->seeking) { + decoder->seeking = false; + /* delete frames from the old song position */ if (decoder->chunk != NULL) { @@ -146,6 +148,8 @@ void decoder_seek_error(struct decoder * decoder) assert(dc->pipe != NULL); dc->seek_error = true; + decoder->seeking = false; + decoder_command_finished(decoder); } |