From: Automerge Script <automerge@asterisk.org>
Date: Thu, 21 Jun 2007 23:25:50 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.20-netsec~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=891600bfdf2bd61da268376c8013ea9d41cfb1f1;p=thirdparty%2Fasterisk.git

automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@70998 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/cdr.c b/cdr.c
index 0646a0af74..01385d85eb 100644
--- a/cdr.c
+++ b/cdr.c
@@ -736,7 +736,8 @@ int ast_cdr_setamaflags(struct ast_channel *chan, const char *flag)
 	newflag = ast_cdr_amaflags2int(flag);
 	if (newflag) {
 		for (cdr = chan->cdr; cdr; cdr = cdr->next) {
-			cdr->amaflags = newflag;
+			if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED))
+				cdr->amaflags = newflag;
 		}
 	}