[svn-commits] russell: branch 1.6.2 r276125 - in /branches/1.6.2: ./ main/features.c

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Jul 13 14:11:24 2010
New Revision: 276125

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=276125
Log:
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).
  ........
................

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/features.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/features.c?view=diff&rev=276125&r1=276124&r2=276125
==============================================================================
--- branches/1.6.2/main/features.c (original)
+++ branches/1.6.2/main/features.c Tue Jul 13 14:11:24 2010
@@ -2975,7 +2975,7 @@
 				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  */
 		}
 	}