[asterisk-commits] trunk - r7522 in /trunk: ./ cdr.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Sun Dec 18 23:42:55 2005
New Revision: 7522

URL: http://svn.digium.com/view/asterisk?rev=7522&view=rev
Log:
Merged revisions 7521 via svnmerge from
/branches/1.2

Modified:
    trunk/   (props changed)
    trunk/cdr.c

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Dec 18 23:42:55 2005
@@ -1,1 +1,1 @@
-/branches/1.2:1-7489,7491-7496,7498-7515,7519
+/branches/1.2:1-7489,7491-7496,7498-7515,7519,7521

Modified: trunk/cdr.c
URL: http://svn.digium.com/view/asterisk/trunk/cdr.c?rev=7522&r1=7521&r2=7522&view=diff
==============================================================================
--- trunk/cdr.c (original)
+++ trunk/cdr.c Sun Dec 18 23:42:55 2005
@@ -691,12 +691,15 @@
 
 int ast_cdr_setamaflags(struct ast_channel *chan, const char *flag)
 {
-	struct ast_cdr *cdr = chan->cdr;
+	struct ast_cdr *cdr;
 	int newflag;
 
 	newflag = ast_cdr_amaflags2int(flag);
-	if (newflag)
-		cdr->amaflags = newflag;
+	if (newflag) {
+		for (cdr = chan->cdr; cdr; cdr = cdr->next) {
+			cdr->amaflags = newflag;
+		}
+	}
 
 	return 0;
 }