automerge commit

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

1 files changed, 4 insertions, 2 deletions

diff --git a/cdr.c b/cdr.c
index 9d3eb68bd..272ce0f69 100644
--- a/cdr.c
+++ b/cdr.c
@@ -520,8 +520,10 @@ void ast_cdr_failed(struct ast_cdr *cdr)
 		chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
 		if (ast_test_flag(cdr, AST_CDR_FLAG_POSTED))
 			ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan);
-		if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED))
-			cdr->disposition = AST_CDR_FAILED;
+		if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
+			if (cdr->disposition < AST_CDR_FAILED)
+				cdr->disposition = AST_CDR_FAILED;
+		}
 		cdr = cdr->next;
 	}
 }