Merged revisions 106654 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
r106654 | tilghman | 2008-03-07 10:26:07 -0600 (Fri, 07 Mar 2008) | 11 lines

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/branches/1.6.0@106662 65c4cc65-6c06-0410-ace0-fbb531ad65f3

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')