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

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71292 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/res/res_features.c b/res/res_features.c
index fa17f6abe5ba5980b42242ccb202d91abfb73e29..228908dbaa94070676ab72b044a0b8fb66b74c85 100644 (file)
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -1858,8 +1858,8 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
                        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 {