diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-06-25 13:04:36 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-06-25 13:04:36 +0000 |
| commit | b8d64002b24d69ebe1f2ce851b46278625cae634 (patch) | |
| tree | 24b2fbe8802bf6879ef8508d952c45ba655dc9ea | |
| parent | 9b23b9b3b200e47f7eb0316c6d11a0b83c0342ea (diff) | |
Merged revisions 71522 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r71522 | file | 2007-06-25 09:03:03 -0400 (Mon, 25 Jun 2007) | 2 lines
Minor tweak for queueing up the unhold frame... this will teach me to do bugs while half asleep. (issue #10046 reported by dimas)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71525 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/chan_agent.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index da862ebef..68b37e8f6 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -959,7 +959,8 @@ 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) + } + 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. */ |