Merged revisions 71522 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Mon, 25 Jun 2007 13:04:36 +0000 (13:04 +0000)
committerJoshua Colp <jcolp@digium.com>
Mon, 25 Jun 2007 13:04:36 +0000 (13:04 +0000)
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

channels/chan_agent.c

index da862eb..68b37e8 100644 (file)
@@ -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;
                }       
                        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. */
                ast_indicate(p->chan, AST_CONTROL_UNHOLD);
        p->owning_app = pthread_self();
        /* After the above step, there should not be any blockers. */