diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-13 19:11:24 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-13 19:11:24 +0000 |
| commit | 5f05ec22c058e7bea12c8744375788118fb2e4dd (patch) | |
| tree | 76d37ecf2dc75e5e3d4bdfac395fa426f059d72f | |
| parent | 2540583cc7d4c70b4dc7c2db3886ee822ee1f956 (diff) | |
Merged revisions 276124 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r276124 | russell | 2010-07-13 14:09:42 -0500 (Tue, 13 Jul 2010) | 9 lines
Merged revisions 276123 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r276123 | russell | 2010-07-13 14:06:53 -0500 (Tue, 13 Jul 2010) | 2 lines
Use chan->cdr instead of chan_cdr (just like peer->cdr instead of peer_cdr in the last commit).
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@276125 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/features.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/features.c b/main/features.c index b205c2624..7c0fbaef1 100644 --- a/main/features.c +++ b/main/features.c @@ -2975,7 +2975,7 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast ast_cdr_specialized_reset(new_peer_cdr, 0); } } else { - ast_cdr_specialized_reset(peer_cdr,0); /* nothing changed, reset the peer_cdr */ + ast_cdr_specialized_reset(peer->cdr, 0); /* nothing changed, reset the peer cdr */ } } |