summaryrefslogtreecommitdiff
path: root/main/channel.c
diff options
context:
space:
mode:
authorDavid Vossel <dvossel@digium.com>2011-04-27 17:44:02 +0000
committerDavid Vossel <dvossel@digium.com>2011-04-27 17:44:02 +0000
commit237d47b010736acb3ac0e9c4ff5c9ce3cf545a2b (patch)
treef6d926c1b0b636a44ad332ecacaba1800b6cedbc /main/channel.c
parent98f94daf883f6f4a3abf53ea411ecef3a63495a8 (diff)
Clears exception flag during ast_read when func_jitterbuffer is enabled
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@315855 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/channel.c')
-rw-r--r--main/channel.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/main/channel.c b/main/channel.c
index 09be9395d..55695c54c 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -3821,6 +3821,8 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio)
f = &ast_null_frame;
chan->fdno = -1;
goto done;
+ } else if (chan->fds[AST_JITTERBUFFER_FD] > -1 && chan->fdno == AST_JITTERBUFFER_FD) {
+ ast_clear_flag(chan, AST_FLAG_EXCEPTION);
}
/* Check for pending read queue */