diff options
author | Joshua Colp <jcolp@digium.com> | 2007-06-25 00:52:03 +0000 |
---|---|---|
committer | Joshua Colp <jcolp@digium.com> | 2007-06-25 00:52:03 +0000 |
commit | 8bab6c1f6998894e00bba2de285efb2d7a9af98b (patch) | |
tree | 8f3a698f5a03aa011b1a59c3c2e31070305ab19a /channels/chan_agent.c | |
parent | 9b1788668cabee72d0205624979c98d75572b6cc (diff) |
Merged revisions 71412 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r71412 | file | 2007-06-24 20:49:21 -0400 (Sun, 24 Jun 2007) | 2 lines
Check to make sure the channel pointer is present before queueing up an unhold frame on it. (issue #10046 reported by dimas)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71413 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_agent.c')
-rw-r--r-- | channels/chan_agent.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index 14572bb93..da862ebef 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -959,7 +959,7 @@ static struct ast_channel *agent_new(struct agent_pvt *p, int state) ast_mutex_unlock(&p->lock); /* For other thread to read the condition. */ return NULL; } - } + } else if (p->chan) ast_indicate(p->chan, AST_CONTROL_UNHOLD); p->owning_app = pthread_self(); /* After the above step, there should not be any blockers. */ |