diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2007-06-24 17:51:55 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2007-06-24 17:51:55 +0000 |
| commit | 2e4b41841d8813f43ac6d866619d3cdb1ef6d543 (patch) | |
| tree | 2cf82c6e51c2fd0d44eb099e05be828f5f0579a0 | |
| parent | d6c0627c4f0245b162c368bce151f86fc4467be8 (diff) | |
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
| -rw-r--r-- | res/res_features.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_features.c b/res/res_features.c index fa17f6abe..228908dba 100644 --- 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 { |