From d1768bd10673b4e394c97ee6d865382906458cfb Mon Sep 17 00:00:00 2001 From: russell Date: Wed, 1 Apr 2009 13:48:26 +0000 Subject: Merged revisions 185771 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r185771 | russell | 2009-04-01 08:47:30 -0500 (Wed, 01 Apr 2009) | 6 lines Fix a case where DTMF could bypass audiohooks. This change fixes a situation where an audiohook that wants DTMF would not actually get it. This is in the code path where we end DTMF digit length emulation while handling a NULL frame. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@185772 f38db490-d61c-443f-a65b-d21fe96a405b --- main/channel.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'main/channel.c') diff --git a/main/channel.c b/main/channel.c index c51747c96..b492f5113 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2828,6 +2828,13 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) ast_clear_flag(chan, AST_FLAG_EMULATE_DTMF); chan->emulate_dtmf_digit = 0; ast_log(LOG_DTMF, "DTMF end emulation of '%c' queued on %s\n", f->subclass, chan->name); + if (chan->audiohooks) { + struct ast_frame *old_frame = f; + f = ast_audiohook_write_list(chan, chan->audiohooks, AST_AUDIOHOOK_DIRECTION_READ, f); + if (old_frame != f) { + ast_frfree(old_frame); + } + } } } break; -- cgit v1.2.3