aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2010-05-04 19:01:11 +0000
committerjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2010-05-04 19:01:11 +0000
commit52ddbfab6ed75ad375499e1f586bbdf757fc9c9b (patch)
tree33869a7140d6e2eda9d7d0189f43a0fc78ccea15 /apps
parent717fa3ae8a1cf913238e520d94cfa9f8485cf143 (diff)
Merged revisions 260924 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r260924 | jpeeler | 2010-05-04 13:51:28 -0500 (Tue, 04 May 2010) | 18 lines Merged revisions 260923 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r260923 | jpeeler | 2010-05-04 13:46:46 -0500 (Tue, 04 May 2010) | 12 lines Voicemail transfer to operator should occur immediately, not after main menu. There were two scenarios in the advanced options that while using the operator=yes and review=yes options, the transfer occurred only after exiting the main menu (after sending a reply or leaving a message for an extension). Now after the audio is processed for the reply or message the transfer occurs immediately as expected. ABE-2107 ABE-2108 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@260927 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r--apps/app_voicemail.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 15efffcbe..7e119f8f0 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -434,6 +434,7 @@ static AST_LIST_HEAD_STATIC(vmstates, vmstate);
#define VM_MESSAGEWRAP (1 << 17) /*!< Wrap around from the last message to the first, and vice-versa */
#define VM_FWDURGAUTO (1 << 18) /*!< Autoset of Urgent flag on forwarded Urgent messages set globally */
#define ERROR_LOCK_PATH -100
+#define OPERATOR_EXIT 300
enum {
@@ -5402,7 +5403,7 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_
pbx_builtin_setvar_helper(chan, "VMSTATUS", "USEREXIT");
}
ast_free(tmp);
- return 0;
+ return OPERATOR_EXIT;
}
/* Allow all other digits to exit Voicemail and return to the dialplan */
@@ -9434,7 +9435,7 @@ static int vm_execmain(struct ast_channel *chan, void *data)
case '1': /* Reply */
if (vms.lastmsg > -1 && !vms.starting) {
cmd = advanced_options(chan, vmu, &vms, vms.curmsg, 1, record_gain);
- if (cmd == ERROR_LOCK_PATH) {
+ if (cmd == ERROR_LOCK_PATH || cmd == OPERATOR_EXIT) {
res = cmd;
goto out;
}
@@ -9484,9 +9485,8 @@ static int vm_execmain(struct ast_channel *chan, void *data)
case '5': /* Leave VoiceMail */
if (ast_test_flag(vmu, VM_SVMAIL)) {
cmd = forward_message(chan, context, &vms, vmu, vmfmts, 1, record_gain, 0);
- if (cmd == ERROR_LOCK_PATH) {
+ if (cmd == ERROR_LOCK_PATH || cmd == OPERATOR_EXIT) {
res = cmd;
- ast_log(AST_LOG_WARNING, "forward_message failed to lock path.\n");
goto out;
}
} else
@@ -9795,13 +9795,14 @@ out:
if (res > -1) {
ast_stopstream(chan);
adsi_goodbye(chan);
- if (valid) {
+ if (valid && res != OPERATOR_EXIT) {
if (silentexit)
res = ast_play_and_wait(chan, "vm-dialout");
else
res = ast_play_and_wait(chan, "vm-goodbye");
- if (res > 0)
- res = 0;
+ }
+ if ((valid && res > 0) || res == OPERATOR_EXIT) {
+ res = 0;
}
if (useadsi)
ast_adsi_unload_session(chan);