summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-09-06 16:25:27 +0200
committerwm4 <wm4@nowhere>2014-09-06 16:25:27 +0200
commit94113e632f162d6331d0fdd559ffe9802330cd05 (patch)
treea1a4bfa4c174f24b4c1a76e2380984dc5b88308e
parenta1d3afb395a8cea5327e3155f32c3d808bd52c49 (diff)
downloadmpv-94113e632f162d6331d0fdd559ffe9802330cd05.tar.bz2
mpv-94113e632f162d6331d0fdd559ffe9802330cd05.tar.xz
audio/out: fix active waiting during pause again
This was fixed in commit 8432eaefa, and commit 39609fc1 of course broke it again. This was pretty stupid.
-rw-r--r--audio/out/push.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/audio/out/push.c b/audio/out/push.c
index 85abb6de85..3285543f24 100644
--- a/audio/out/push.c
+++ b/audio/out/push.c
@@ -120,8 +120,9 @@ static void reset(struct ao *ao)
ao->driver->reset(ao);
mp_audio_buffer_clear(p->buffer);
p->paused = false;
+ if (p->still_playing)
+ wakeup_playthread(ao);
p->still_playing = false;
- wakeup_playthread(ao);
pthread_mutex_unlock(&p->lock);
}