[asterisk-commits] mmichelson: trunk r237882 - /trunk/apps/app_dial.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Jan  5 14:56:50 2010
New Revision: 237882

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=237882
Log:
Mismerged a bit.


Modified:
    trunk/apps/app_dial.c

Modified: trunk/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_dial.c?view=diff&rev=237882&r1=237881&r2=237882
==============================================================================
--- trunk/apps/app_dial.c (original)
+++ trunk/apps/app_dial.c Tue Jan  5 14:56:50 2010
@@ -1910,7 +1910,7 @@
 			connected.id.number_presentation = AST_PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN;
 			ast_channel_set_connected_line(tmp->chan, &connected);
 		} else {
-			ast_connected_line_copy_from_caller(&tmp->chan->connected, &chan->cid);
+			ast_connected_line_copy_from_caller(&tc->connected, &chan->cid);
 		}
 
 		S_REPLACE(tc->cid.cid_rdnis, ast_strdup(chan->cid.cid_rdnis));