From d07cd11b14ab9b91f73a31787bced50660bdd0a8 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 12 Jun 2014 00:30:21 +0200
Subject: audio: don't wait when draining and paused

A corner case that could possibly lead to infinite waiting. Though
I'm not aware that this actually happened in practice.
---
 audio/out/push.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'audio')

diff --git a/audio/out/push.c b/audio/out/push.c
index e98d3e6abb..9b2355a0c2 100644
--- a/audio/out/push.c
+++ b/audio/out/push.c
@@ -295,7 +295,7 @@ static void *playthread(void *arg)
             p->requested_data = true;
         }
 
-        if (p->drain && p->avoid_ao_wait) {
+        if (p->drain && (p->avoid_ao_wait || p->paused)) {
             if (ao->driver->drain)
                 ao->driver->drain(ao);
             p->drain = false;
-- 
cgit v1.2.3