Merged revisions 276123 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Tue, 13 Jul 2010 19:09:42 +0000 (19:09 +0000)
committerRussell Bryant <russell@russellbryant.com>
Tue, 13 Jul 2010 19:09:42 +0000 (19:09 +0000)
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: https://origsvn.digium.com/svn/asterisk/trunk@276124 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/features.c

index 32b3112..a107b4b 100644 (file)
@@ -3483,7 +3483,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  */
                }
        }