[asterisk-commits] jpeeler: branch 1.4 r261735 - /branches/1.4/apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Thu May  6 15:10:59 2010
New Revision: 261735

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=261735
Log:
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

Modified:
    branches/1.4/apps/app_voicemail.c

Modified: branches/1.4/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/apps/app_voicemail.c?view=diff&rev=261735&r1=261734&r2=261735
==============================================================================
--- branches/1.4/apps/app_voicemail.c (original)
+++ branches/1.4/apps/app_voicemail.c Thu May  6 15:10:59 2010
@@ -8146,6 +8146,9 @@
 	}
 
 	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 @@
 				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;
 			}