aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--NEWS1
-rw-r--r--src/output/alsa_plugin.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index d6338961b..9fe1dc18d 100644
--- a/NEWS
+++ b/NEWS
@@ -35,6 +35,7 @@ ver 0.16 (20??/??/??)
- jack: don't disconnect during pause
- jack: connect to server on MPD startup
- wildcards allowed in audio_format configuration
+ - alsa: don't recover on CANCEL
* mixers:
- removed support for legacy mixer configuration
- reimplemented software volume as mixer+filter plugin
diff --git a/src/output/alsa_plugin.c b/src/output/alsa_plugin.c
index 6ec1f77f2..89ed6058e 100644
--- a/src/output/alsa_plugin.c
+++ b/src/output/alsa_plugin.c
@@ -500,7 +500,7 @@ alsa_cancel(void *data)
{
struct alsa_data *ad = data;
- alsa_recover(ad, snd_pcm_drop(ad->pcm));
+ snd_pcm_drop(ad->pcm);
}
static void