diff options
| author | Max Kellermann <max@duempel.org> | 2009-08-15 21:18:38 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-08-15 21:18:38 +0200 |
| commit | f401c1059c78358b701dbee22ca78035c6e652eb (patch) | |
| tree | 5cf487eea76b70b91e6acee8f55b6ca135b45a4a /src/output_thread.c | |
| parent | e28a0e97b5d2e54684c6452d6d45f64ff1e542d9 (diff) | |
| parent | 5715534b530cfed0d6650b0fb34cfcb17da4088b (diff) | |
| download | mpd-f401c1059c78358b701dbee22ca78035c6e652eb.tar.gz mpd-f401c1059c78358b701dbee22ca78035c6e652eb.tar.xz mpd-f401c1059c78358b701dbee22ca78035c6e652eb.zip | |
Merged release 0.15.2 from branch 'v0.15.x'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'src/output_thread.c')
| -rw-r--r-- | src/output_thread.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/output_thread.c b/src/output_thread.c index c7bd069b1..e1f20e580 100644 --- a/src/output_thread.c +++ b/src/output_thread.c @@ -295,6 +295,7 @@ static void ao_pause(struct audio_output *ao) bool ret; ao_plugin_cancel(ao->plugin, ao->data); + ao->pause = true; ao_command_finished(ao); do { @@ -304,6 +305,8 @@ static void ao_pause(struct audio_output *ao) break; } } while (ao->command == AO_COMMAND_NONE); + + ao->pause = false; } static gpointer audio_output_task(gpointer arg) |