diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-06 20:10:59 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-06 20:10:59 +0000 |
| commit | f601931af1e17f4c2a1a74a9cb77c1f89f36014b (patch) | |
| tree | 0fcd21e15af94cd12a709a800f1c7433aaa1dd87 /apps | |
| parent | f6eb71cfd8012df31a11250c0d9ab7577fc93643 (diff) | |
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.4@261735 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -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 03dd532a8..701689f2b 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -8146,6 +8146,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(LOG_ERROR, "Could not leave voicemail. The path is already locked.\n"); @@ -9487,7 +9490,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; } |