kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-28 00:10:25 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 261735 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/trunk@261736 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2010-05-06 20:11:53 +00:00
parent 8d42a80bed
commit 8312f25b13
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/app_voicemail.c
+4 -1
View File
@@ -10179,6 +10179,9 @@ static int vm_exec(struct ast_channel *chan, const char *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");
@@ -12927,7 +12930,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;
}