diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2010-10-06 18:56:11 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2010-10-06 18:56:11 +0000 |
| commit | 0e8c87d9b0c595a3ddc3fec01a4f36e3d6002d8e (patch) | |
| tree | 844a1dae525fcf7b903bd2c54e02c8dc73424a35 /apps/app_dial.c | |
| parent | 45432d77b0e0fc91292ec3df8c1e700fbcac9fd6 (diff) | |
Merged revisions 290614 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r290614 | rmudgett | 2010-10-06 13:50:37 -0500 (Wed, 06 Oct 2010) | 12 lines
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/trunk@290615 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_dial.c')
| -rw-r--r-- | apps/app_dial.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 51dacb6db..bb589a8ca 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -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) { |