From 568ab3672a16b4a89a775d2418eea1976ef02a21 Mon Sep 17 00:00:00 2001 From: Johan Kiviniemi Date: Fri, 20 Sep 2013 06:58:18 +0300 Subject: ao_pulse: bug fix: goto the correct error handler Conflicts: audio/out/ao_pulse.c --- audio/out/ao_pulse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/audio/out/ao_pulse.c b/audio/out/ao_pulse.c index 613c444aa9..590e8b79c8 100644 --- a/audio/out/ao_pulse.c +++ b/audio/out/ao_pulse.c @@ -299,11 +299,11 @@ static int init(struct ao *ao) if (!pa_sample_spec_valid(&ss)) { mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] Invalid sample spec\n"); - goto fail; + goto unlock_and_fail; } if (!select_chmap(ao, &map)) - goto fail; + goto unlock_and_fail; if (!(proplist = pa_proplist_new())) { mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] Failed to allocate proplist\n"); -- cgit v1.2.3