diff options
author | Max Kellermann <max@duempel.org> | 2009-07-16 07:37:13 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2009-07-16 07:37:13 +0200 |
commit | 4100035b19a5d0dedcf8f71a272fa67f6a24361a (patch) | |
tree | c4a0f11b0cf5d219fd70e55316ed0b95f348480c /src/output_thread.c | |
parent | 9bef46c0daa4fa2778db0e05d5883746cc995264 (diff) | |
parent | d7bad6ae020ffabfd5d2ae9d2ce723e67e999077 (diff) | |
download | mpd-4100035b19a5d0dedcf8f71a272fa67f6a24361a.tar.gz mpd-4100035b19a5d0dedcf8f71a272fa67f6a24361a.tar.xz mpd-4100035b19a5d0dedcf8f71a272fa67f6a24361a.zip |
Merged release 0.15.1 from branch 'v0.15.x'
Diffstat (limited to '')
-rw-r--r-- | src/output_thread.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/output_thread.c b/src/output_thread.c index 4b60d9d60..2592b2456 100644 --- a/src/output_thread.c +++ b/src/output_thread.c @@ -338,7 +338,11 @@ static gpointer audio_output_task(gpointer arg) case AO_COMMAND_PAUSE: ao_pause(ao); - break; + /* don't "break" here: this might cause + ao_play() to be called when command==CLOSE + ends the paused state - "continue" checks + the new command first */ + continue; case AO_COMMAND_CANCEL: ao->chunk = NULL; |