Merged release 0.15.7 from branch 'v0.15.x'

Conflicts:
	NEWS
	configure.ac
	src/decoder_api.c
This commit is contained in:
Max Kellermann
2009-12-27 20:10:45 +01:00
5 changed files with 12 additions and 6 deletions

View File

@@ -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);
}