diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-06 20:13:06 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-06 20:13:06 +0000 |
| commit | bb14a6fa36fca2ef47eb2ad63421f739ed1f8b30 (patch) | |
| tree | 9e994f97c9eca6e4d2ec40b2a3a494f770400297 | |
| parent | 7282ce86a0c25d8205516f103ce15f3fda6064cd (diff) | |
Merged revisions 261736 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r261736 | jpeeler | 2010-05-06 15:11:53 -0500 (Thu, 06 May 2010) | 15 lines
Merged revisions 261735 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r261735 | jpeeler | 2010-05-06 15:10:59 -0500 (Thu, 06 May 2010) | 8 lines
Only allow the operator key to be accepted after leaving a voicemail.
Or rather disallow the operator key from being accepted when not offered,
such as after finishing a recording from within the mailbox options menu.
ABE-2121
SWP-1267
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@261738 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_voicemail.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 803b1f815..4f41f09ba 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -9780,6 +9780,9 @@ static int vm_exec(struct ast_channel *chan, void *data) } res = leave_voicemail(chan, args.argv0, &leave_options); + if (res == OPERATOR_EXIT) { + res = 0; + } if (res == ERROR_LOCK_PATH) { ast_log(AST_LOG_ERROR, "Could not leave voicemail. The path is already locked.\n"); @@ -11672,7 +11675,7 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re return 1; #endif case '0': - if (!ast_test_flag(vmu, VM_OPERATOR)) { + if (!ast_test_flag(vmu, VM_OPERATOR) || !outsidecaller) { cmd = ast_play_and_wait(chan, "vm-sorry"); break; } |