diff options
author | Jason Parker <jparker@digium.com> | 2008-03-10 20:28:33 +0000 |
---|---|---|
committer | Jason Parker <jparker@digium.com> | 2008-03-10 20:28:33 +0000 |
commit | 6477f207f1dd3a158ac53b0eb056a695d4884745 (patch) | |
tree | 1f22d2d3f232c2d9c19a2ffb862f5f620eeaf4a2 /channels/chan_zap.c | |
parent | 0ee1f43b4a5d297d190801c719b1d216a6e1aa52 (diff) |
Merged revisions 107173 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r107173 | qwell | 2008-03-10 15:27:08 -0500 (Mon, 10 Mar 2008) | 5 lines
Make sure to reenable echo can after a "failed" (canceled, etc) three-way call.
(closes issue #11335)
Reported by: rebuild
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@107177 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_zap.c')
-rw-r--r-- | channels/chan_zap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 0bb2d0b2e..ae5f34e80 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -5150,6 +5150,7 @@ static struct ast_frame *__zt_exception(struct ast_channel *ast) update_conf(p); break; case ZT_EVENT_RINGOFFHOOK: + zt_enable_ec(p); zt_set_hook(p->subs[SUB_REAL].zfd, ZT_OFFHOOK); if (p->owner && (p->owner->_state == AST_STATE_RINGING)) { p->subs[SUB_REAL].needanswer = 1; |