Merged revisions 107177 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
r107177 | qwell | 2008-03-10 15:28:33 -0500 (Mon, 10 Mar 2008) | 13 lines

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/branches/1.6.0@107180 65c4cc65-6c06-0410-ace0-fbb531ad65f3

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;