diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-24 17:50:24 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-24 17:50:24 +0000 |
| commit | 2f807ff4b9c932ec93a374990544b6c01fa7e844 (patch) | |
| tree | 7556843e19d001992c1a2f4a21c1beb48f2be6cb | |
| parent | 9d1f2c21182cc89876fb819c974b4245df12c56f (diff) | |
Issue 10044 - chan->cdr is NULL here, so peer->cdr is what we really wanted to use
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@71291 f38db490-d61c-443f-a65b-d21fe96a405b
| -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 cd273a076..a4d3e9cef 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -1581,8 +1581,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 { |