Merged revision 290613 from

https://origsvn.digium.com/svn/asterisk/be/branches/C.3-bier

..........
  r290613 | rmudgett | 2010-10-06 13:42:41 -0500 (Wed, 06 Oct 2010) | 5 lines

  Eliminate a redundant test for AST_CONTROL_REDIRECTING.

  Eliminate redundant test for AST_CONTROL_REDIRECTING that prevents running
  the redirecting interception macro if it is defined.
..........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@290614 65c4cc65-6c06-0410-ace0-fbb531ad65f3
certified/1.8.6
Richard Mudgett 15 years ago
parent b112c3de5c
commit 966c392632

@ -1404,8 +1404,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
if ((f->subclass.integer == AST_CONTROL_HOLD) ||
(f->subclass.integer == AST_CONTROL_UNHOLD) ||
(f->subclass.integer == AST_CONTROL_VIDUPDATE) ||
(f->subclass.integer == AST_CONTROL_SRCUPDATE) ||
(f->subclass.integer == AST_CONTROL_REDIRECTING)) {
(f->subclass.integer == AST_CONTROL_SRCUPDATE)) {
ast_verb(3, "%s requested special control %d, passing it to %s\n", in->name, f->subclass.integer, outgoing->chan->name);
ast_indicate_data(outgoing->chan, f->subclass.integer, f->data.ptr, f->datalen);
} else if (f->subclass.integer == AST_CONTROL_CONNECTED_LINE) {

Loading…
Cancel
Save