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 0646a0af74a12c0bf59505ceeeb08b169c67f074..01385d85ebada471633795d20f12c9a7d607849e 100644 (file)
--- 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;
                }
        }