[svn-commits] tilghman: trunk r71292 - in /trunk: ./ res/res_features.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Sun Jun 24 12:51:55 2007
New Revision: 71292

URL: http://svn.digium.com/view/asterisk?view=rev&rev=71292
Log:
Merged revisions 71291 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r71291 | tilghman | 2007-06-24 12:50:24 -0500 (Sun, 24 Jun 2007) | 2 lines

Issue 10044 - chan->cdr is NULL here, so peer->cdr is what we really wanted to use

........

Modified:
    trunk/   (props changed)
    trunk/res/res_features.c

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

Modified: trunk/res/res_features.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_features.c?view=diff&rev=71292&r1=71291&r2=71292
==============================================================================
--- trunk/res/res_features.c (original)
+++ trunk/res/res_features.c Sun Jun 24 12:51:55 2007
@@ -1858,8 +1858,8 @@
 			ast_cdr_init(bridge_cdr,peer);
 			/* absorb this data */
 			ast_cdr_merge(bridge_cdr, peer->cdr);
-			if (!ast_test_flag(chan->cdr, AST_CDR_FLAG_LOCKED))
-				ast_cdr_discard(chan->cdr); /* if locked cdrs are in chan, they are taken over in the merge */
+			if (!ast_test_flag(peer->cdr, AST_CDR_FLAG_LOCKED))
+				ast_cdr_discard(peer->cdr); /* if locked cdrs are in chan, they are taken over in the merge */
 			peer->cdr = NULL;
 			peer->cdr = bridge_cdr; /* make this available to the rest of the world via the chan while the call is in progress */
 		} else {