[asterisk-commits] murf: branch 1.6.1 r141159 - in /branches/1.6.1: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: murf
Date: Fri Sep  5 09:25:49 2008
New Revision: 141159

URL: http://svn.digium.com/view/asterisk?view=rev&rev=141159
Log:
Merged revisions 141157 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r141157 | murf | 2008-09-05 08:18:43 -0600 (Fri, 05 Sep 2008) | 9 lines

Merged revisions 141156 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r141156 | murf | 2008-09-05 08:15:43 -0600 (Fri, 05 Sep 2008) | 1 line

A small change to prevent double-posting of CDR's; thanks to Daniel Ferrer for bringing it to our attention
........

................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/channel.c

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

Modified: branches/1.6.1/main/channel.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/channel.c?view=diff&rev=141159&r1=141158&r2=141159
==============================================================================
--- branches/1.6.1/main/channel.c (original)
+++ branches/1.6.1/main/channel.c Fri Sep  5 09:25:49 2008
@@ -1362,7 +1362,7 @@
 	ast_jb_destroy(chan);
 
 	if (chan->cdr) {
-		ast_cdr_detach(chan->cdr);
+		ast_cdr_discard(chan->cdr);
 		chan->cdr = NULL;
 	}