diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-19 16:07:43 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-19 16:07:43 +0000 |
| commit | 40c8540186d0ceec07c8031648f841c99755c031 (patch) | |
| tree | 402e06daa7e6961388337e19989e7be2c28790f6 /apps | |
| parent | 3ae3c8a701f527284ce7dfb6a3f0434d1491de4f (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@28674 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_queue.c | 2 | ||||
| -rw-r--r-- | apps/app_voicemail.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index a35a3ee19..61cf45617 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -431,6 +431,8 @@ static enum queue_member_status get_member_status(const struct ast_call_queue *q enum queue_member_status result = QUEUE_NO_MEMBERS; for (member = q->members; member; member = member->next) { + if (member->paused) continue; + switch (member->status) { case AST_DEVICE_INVALID: /* nothing to do */ diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 214c7aff3..b595944f2 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -5310,7 +5310,7 @@ static int vm_execmain(struct ast_channel *chan, void *data) case '5': /* Leave VoiceMail */ if (ast_test_flag(vmu, VM_SVMAIL)) { - cmd = forward_message(chan, context, vms.curdir, vms.curmsg, vmu, vmfmts, 1, record_gain); + cmd = forward_message(chan, vmu->context, vms.curdir, vms.curmsg, vmu, vmfmts, 1, record_gain); if (cmd == ERROR_LOCK_PATH) { res = cmd; goto out; @@ -5391,7 +5391,7 @@ static int vm_execmain(struct ast_channel *chan, void *data) case '8': if (vms.lastmsg > -1) { - cmd = forward_message(chan, context, vms.curdir, vms.curmsg, vmu, vmfmts, 0, record_gain); + cmd = forward_message(chan, vmu->context, vms.curdir, vms.curmsg, vmu, vmfmts, 0, record_gain); if (cmd == ERROR_LOCK_PATH) { res = cmd; goto out; |