From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 13 Jul 2010 19:11:24 +0000 (+0000)
Subject: Merged revisions 276124 via svnmerge from
X-Git-Tag: 1.6.2.11-rc1~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bd5f566153277d8b581f00758a91d17d5d2d3a4;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@276125 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/features.c b/main/features.c
index b205c26244..7c0fbaef1c 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  */
 		}
 	}