[asterisk-commits] qwell: branch 1.6.0 r107180 - in /branches/1.6.0: ./ channels/chan_zap.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Mon Mar 10 15:29:21 2008
New Revision: 107180

URL: http://svn.digium.com/view/asterisk?view=rev&rev=107180
Log:
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

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_zap.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_zap.c?view=diff&rev=107180&r1=107179&r2=107180
==============================================================================
--- branches/1.6.0/channels/chan_zap.c (original)
+++ branches/1.6.0/channels/chan_zap.c Mon Mar 10 15:29:21 2008
@@ -5150,6 +5150,7 @@
 			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;