summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2008-03-07 16:26:07 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2008-03-07 16:26:07 +0000
commit0b8bccb5ce4e1a5a9f5fc63bb778ea5494c37fb9 (patch)
tree3fb04aa3d9616dd617e0c38c2e18dc3e353c6fba /apps
parenta60f591c72aec5beddfbb1d1418c5a3587c8f07b (diff)
Merged revisions 106635 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r106635 | tilghman | 2008-03-07 10:22:11 -0600 (Fri, 07 Mar 2008) | 3 lines Warn the user when a temporary greeting exists (Closes issue #11409) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@106654 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
-rw-r--r--apps/app_voicemail.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 84b1f3101..9b89a6639 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -6607,13 +6607,22 @@ static int vm_options(struct ast_channel *chan, struct ast_vm_user *vmu, struct
cmd = 't';
break;
default:
- cmd = ast_play_and_wait(chan, "vm-options");
- if (!cmd)
+ snprintf(prefile, sizeof(prefile), "%s%s/%s/temp", VM_SPOOL_DIR, vmu->context, vms->username);
+ if (ast_fileexists(prefile, NULL, NULL)) {
+ cmd = ast_play_and_wait(chan, "vm-tmpexists");
+ }
+ if (!cmd) {
+ cmd = ast_play_and_wait(chan, "vm-options");
+ }
+ if (!cmd) {
cmd = ast_waitfordigit(chan, 6000);
- if (!cmd)
+ }
+ if (!cmd) {
retries++;
- if (retries > 3)
+ }
+ if (retries > 3) {
cmd = 't';
+ }
}
}
if (cmd == 't')