diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-10-22 14:28:07 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-10-22 14:28:07 +0000 |
| commit | eb210541d3ed06a77d3f0f647310daa6f607b117 (patch) | |
| tree | ebeb64fbe5068ccb12fdb7464f2abf595ce4766a | |
| parent | f1dff2a0f6d15a17886864beb71efac63805c5c0 (diff) | |
Merged revisions 86663 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r86663 | file | 2007-10-22 11:27:03 -0300 (Mon, 22 Oct 2007) | 6 lines
Move log message to before the frame it references is freed.
(closes issue #11050)
Reported by: slavon
Patches:
channel.c.86662.diff uploaded by casper (license 55)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@86664 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/channel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c index 2edeebbf7..4ee088948 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2379,9 +2379,9 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) if ( ast_test_flag(chan, AST_FLAG_DEFER_DTMF | AST_FLAG_END_DTMF_ONLY) || (!ast_tvzero(chan->dtmf_tv) && ast_tvdiff_ms(ast_tvnow(), chan->dtmf_tv) < AST_MIN_DTMF_GAP) ) { + ast_log(LOG_DTMF, "DTMF begin ignored '%c' on %s\n", f->subclass, chan->name); ast_frfree(f); f = &ast_null_frame; - ast_log(LOG_DTMF, "DTMF begin ignored '%c' on %s\n", f->subclass, chan->name); } else { ast_set_flag(chan, AST_FLAG_IN_DTMF); chan->dtmf_tv = ast_tvnow(); |