[asterisk-commits] rmudgett: trunk r307963 - in /trunk: ./ apps/app_dial.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue Feb 15 13:53:32 2011
New Revision: 307963

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

Modified:
    trunk/   (props changed)
    trunk/apps/app_dial.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_dial.c?view=diff&rev=307963&r1=307962&r2=307963
==============================================================================
--- trunk/apps/app_dial.c (original)
+++ trunk/apps/app_dial.c Tue Feb 15 13:53:32 2011
@@ -2115,7 +2115,7 @@
 			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 @@
 				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);
 		}