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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 84b1f3101749f09a369358a51e588ee3bd041f71..9b89a66398da930d454318b2b6d019a90c262c61 100644 (file)
--- 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')