diff options
Diffstat (limited to 'apps/app_queue.c')
| -rw-r--r-- | apps/app_queue.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index 713dba2d7..906dff15f 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -2040,12 +2040,8 @@ static void queue_publish_multi_channel_blob(struct ast_channel *caller, struct RAII_VAR(struct ast_channel_snapshot *, caller_snapshot, NULL, ao2_cleanup); RAII_VAR(struct ast_channel_snapshot *, agent_snapshot, NULL, ao2_cleanup); - ast_channel_lock(caller); caller_snapshot = ast_channel_snapshot_create(caller); - ast_channel_unlock(caller); - ast_channel_lock(agent); agent_snapshot = ast_channel_snapshot_create(agent); - ast_channel_unlock(agent); if (!caller_snapshot || !agent_snapshot) { return; @@ -3456,9 +3452,7 @@ static int join_queue(char *queuename, struct queue_ent *qe, enum queue_result * "Queue", q->name, "Position", qe->pos, "Count", q->count); - ast_channel_lock(qe->chan); ast_channel_publish_blob(qe->chan, queue_caller_join_type(), blob); - ast_channel_unlock(qe->chan); ast_debug(1, "Queue '%s' Join, Channel '%s', Position '%d'\n", q->name, ast_channel_name(qe->chan), qe->pos ); } ao2_unlock(q); @@ -3737,9 +3731,7 @@ static void leave_queue(struct queue_ent *qe) "Queue", q->name, "Position", qe->pos, "Count", q->count); - ast_channel_lock(qe->chan); ast_channel_publish_blob(qe->chan, queue_caller_leave_type(), blob); - ast_channel_unlock(qe->chan); ast_debug(1, "Queue '%s' Leave, Channel '%s'\n", q->name, ast_channel_name(qe->chan)); /* Take us out of the queue */ if (prev) { @@ -4337,13 +4329,10 @@ static void record_abandoned(struct queue_ent *qe) "Position", qe->pos, "OriginalPosition", qe->opos, "HoldTime", (int)(time(NULL) - qe->start)); + ast_channel_publish_blob(qe->chan, queue_caller_abandon_type(), blob); qe->parent->callsabandoned++; ao2_unlock(qe->parent); - - ast_channel_lock(qe->chan); - ast_channel_publish_blob(qe->chan, queue_caller_abandon_type(), blob); - ast_channel_unlock(qe->chan); } /*! \brief RNA == Ring No Answer. Common code that is executed when we try a queue member and they don't answer. */ |