diff options
author | Mark Spencer <markster@digium.com> | 2004-10-17 22:13:05 +0000 |
---|---|---|
committer | Mark Spencer <markster@digium.com> | 2004-10-17 22:13:05 +0000 |
commit | 12e2fe4d94d4ddb9e7717450860bfb94d9aad820 (patch) | |
tree | b68846ec425ce1bb717d2ea9a49ad679234796dd /apps/app_voicemail.c | |
parent | 9f5f95fe8702d6c105f7975c5ca02423b80c03f5 (diff) |
Thread fixes, vm fix (bug #2665)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4030 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_voicemail.c')
-rwxr-xr-x | apps/app_voicemail.c | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 31b81dee1..bd01be0fe 100755 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -1332,16 +1332,22 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, int silent, int } /* Check for a '0' here */ if (res == '0') { - transfer: - strncpy(chan->exten, "o", sizeof(chan->exten) - 1); - if (!ast_strlen_zero(vmu->exit)) { - strncpy(chan->context, vmu->exit, sizeof(chan->context) - 1); - } else if (ousemacro && !ast_strlen_zero(chan->macrocontext)) { - strncpy(chan->context, chan->macrocontext, sizeof(chan->context) - 1); + transfer: + if (vmu->operator) { + strncpy(chan->exten, "o", sizeof(chan->exten) - 1); + if (!ast_strlen_zero(vmu->exit)) { + strncpy(chan->context, vmu->exit, sizeof(chan->context) - 1); + } else if (ousemacro && !ast_strlen_zero(chan->macrocontext)) { + strncpy(chan->context, chan->macrocontext, sizeof(chan->context) - 1); + } + ast_play_and_wait(chan, "transfer"); + chan->priority = 0; + free_user(vmu); + return 0; + } else { + ast_play_and_wait(chan, "vm-sorry"); + return 0; } - chan->priority = 0; - free_user(vmu); - return 0; } if (res < 0) { free_user(vmu); @@ -4605,9 +4611,7 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re /* User has hung up, no options to give */ return res; if (cmd == '0') { - /* Erase the message if 0 pushed during playback */ - ast_play_and_wait(chan, "vm-deleted"); - vm_delete(recordfile); + break; } else if (cmd == '*') { break; } @@ -4660,13 +4664,11 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re return 1; #endif case '0': - if (outsidecaller && vmu->operator) { - if (message_exists) - ast_play_and_wait(chan, "vm-msgsaved"); - return cmd; - } else - cmd = ast_play_and_wait(chan, "vm-sorry"); - break; + if (message_exists || recorded) { + ast_play_and_wait(chan, "vm-deleted"); + vm_delete(recordfile); + } + return cmd; default: /* If the caller is an ouside caller, and the review option is enabled, allow them to review the message, but let the owner of the box review |