From 0b8bccb5ce4e1a5a9f5fc63bb778ea5494c37fb9 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Fri, 7 Mar 2008 16:26:07 +0000 Subject: [PATCH] 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 --- apps/app_voicemail.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 84b1f31017..9b89a66398 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')