diff options
author | Richard Mudgett <rmudgett@digium.com> | 2011-02-15 19:53:32 +0000 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2011-02-15 19:53:32 +0000 |
commit | b1db966684249fcf190ff8dc430e9fcefd9a492e (patch) | |
tree | eee2d9725d6e28d46780ada8b54a77a57b493a40 | |
parent | 64ed1ba3e9da013d0c1b26047db88108b8ffb1c5 (diff) |
Merged revisions 307962 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r307962 | rmudgett | 2011-02-15 13:52:45 -0600 (Tue, 15 Feb 2011) | 1 line
Don't crash when forcing caller id.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@307963 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | apps/app_dial.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index d0faa383d..943ef30c3 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -2115,7 +2115,7 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast struct ast_party_connected_line connected; int pres; - ast_party_connected_line_set_init(&connected, &tmp->chan->connected); + ast_party_connected_line_set_init(&connected, &tc->connected); if (cid_pres) { pres = ast_parse_caller_presentation(cid_pres); if (pres < 0) { @@ -2135,7 +2135,7 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast connected.id.name.presentation = pres; } connected.id.tag = cid_tag; - ast_channel_set_connected_line(tmp->chan, &connected, NULL); + ast_channel_set_connected_line(tc, &connected, NULL); } else { ast_connected_line_copy_from_caller(&tc->connected, &chan->caller); } |