automerge commit

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

diff --git a/cdr.c b/cdr.c
index 9d3eb68bd6bc87c97564533b42528ee3eab0c749..272ce0f6955366362b4a9913006967f4141471ab 100644 (file)
--- 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;
        }
 }

diff --git a/include/asterisk/cdr.h b/include/asterisk/cdr.h
index c438829463992754a2feb6f45f81012caaa0a5ef..ae10ac13a3e31d2d1c54a6529ee2c43172769c5f 100644 (file)
--- a/include/asterisk/cdr.h
+++ b/include/asterisk/cdr.h
@@ -32,8 +32,8 @@
 
 #define AST_CDR_NOANSWER                       (1 << 0)
 #define AST_CDR_BUSY                           (1 << 1)
-#define AST_CDR_ANSWERED                       (1 << 2)
-#define AST_CDR_FAILED                         (1 << 3)
+#define AST_CDR_FAILED                         (1 << 2)
+#define AST_CDR_ANSWERED                       (1 << 3)
 
 /*! AMA Flags */
 #define AST_CDR_OMIT                           (1)