kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-17 15:29:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@25561 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-05-08 14:07:31 +00:00
parent d4b1647374
commit 626a5228e3
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/app_queue.c
View File

@@ -1184,6 +1184,8 @@ static int say_position(struct queue_ent *qe)
/* Set our last_pos indicators */ /* Set our last_pos indicators */
qe->last_pos = now; qe->last_pos = now;
qe->last_pos_said = qe->pos; qe->last_pos_said = qe->pos;
/* Don't restart music on hold if we're about to exit the caller from the queue */
if (res)
ast_moh_start(qe->chan, qe->moh); ast_moh_start(qe->chan, qe->moh);
return res; return res;
@@ -2989,7 +2991,7 @@ check_turns:
/* Make a position announcement, if enabled */ /* Make a position announcement, if enabled */
if (qe.parent->announcefrequency && !ringing) if (qe.parent->announcefrequency && !ringing)
res = say_position(&qe); res = say_position(&qe);
if (res && valid_exit(&qe, res)) { if (res) {
ast_queue_log(queuename, chan->uniqueid, "NONE", "EXITWITHKEY", "%s|%d", qe.digits, qe.pos); ast_queue_log(queuename, chan->uniqueid, "NONE", "EXITWITHKEY", "%s|%d", qe.digits, qe.pos);
break; break;
} }
@@ -3523,13 +3525,13 @@ static int manager_queues_status( struct mansession *s, struct message *m )
} }
ast_mutex_unlock(&q->lock); ast_mutex_unlock(&q->lock);
} }
ast_mutex_unlock(&qlock);
ast_cli(s->fd, ast_cli(s->fd,
"Event: QueueStatusComplete\r\n" "Event: QueueStatusComplete\r\n"
"%s" "%s"
"\r\n",idText); "\r\n",idText);
ast_mutex_unlock(&qlock);
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }