automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@70998 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 2 insertions, 1 deletions

diff --git a/cdr.c b/cdr.c
index 0646a0af7..01385d85e 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;
 		}
 	}