From: Joshua Colp <jcolp@digium.com>
Date: Mon, 25 Jun 2007 13:04:36 +0000 (+0000)
Subject: Merged revisions 71522 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2260
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8d64002b24d69ebe1f2ce851b46278625cae634;p=thirdparty%2Fasterisk.git

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
---

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index da862ebefc..68b37e8f69 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. */