diff options
| author | Max Kellermann <max@duempel.org> | 2009-10-18 19:02:43 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-10-18 19:02:43 +0200 |
| commit | 447e4d3583d3394a25f0fb186f50cea45dd7f797 (patch) | |
| tree | dfbafa9caaef9cc203cd6dde2b090d47d847ae1d /src/output_thread.c | |
| parent | 33bf6c09787033597588e96a6530d5c04b5eb166 (diff) | |
| parent | 7df1a2c77d7f0ac2073d3fe9c7ff85dc4a28e12a (diff) | |
| download | mpd-447e4d3583d3394a25f0fb186f50cea45dd7f797.tar.gz mpd-447e4d3583d3394a25f0fb186f50cea45dd7f797.tar.xz mpd-447e4d3583d3394a25f0fb186f50cea45dd7f797.zip | |
Merged release 0.15.5 from branch 'v0.15.x'
Conflicts:
NEWS
configure.ac
src/decoder/flac_plugin.c
src/update.c
Diffstat (limited to 'src/output_thread.c')
| -rw-r--r-- | src/output_thread.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/output_thread.c b/src/output_thread.c index e1f20e580..11dea0845 100644 --- a/src/output_thread.c +++ b/src/output_thread.c @@ -351,7 +351,8 @@ static gpointer audio_output_task(gpointer arg) case AO_COMMAND_CANCEL: ao->chunk = NULL; - ao_plugin_cancel(ao->plugin, ao->data); + if (ao->open) + ao_plugin_cancel(ao->plugin, ao->data); ao_command_finished(ao); /* the player thread will now clear our music |