[svn-commits] mmichelson: branch mmichelson/imap_consistency_trunk r135593 - /team/mmichels...

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Mon Aug  4 17:16:30 2008
New Revision: 135593

URL: http://svn.digium.com/view/asterisk?view=rev&rev=135593
Log:
Add some clarification


Modified:
    team/mmichelson/imap_consistency_trunk/apps/app_voicemail.c

Modified: team/mmichelson/imap_consistency_trunk/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/mmichelson/imap_consistency_trunk/apps/app_voicemail.c?view=diff&rev=135593&r1=135592&r2=135593
==============================================================================
--- team/mmichelson/imap_consistency_trunk/apps/app_voicemail.c (original)
+++ team/mmichelson/imap_consistency_trunk/apps/app_voicemail.c Mon Aug  4 17:16:30 2008
@@ -6201,10 +6201,11 @@
 					res = ast_play_and_wait(chan, "vm-messages");
 				if (!res)
 					res = ast_play_and_wait(chan, "vm-saved"); */
-#ifndef IMAP_STORAGE
+#ifdef IMAP_STORAGE
 				/* If forwarded with intro, DON'T PLAY THIS MESSAGE AGAIN! */
+				if (ast_strlen_zero(vmstmp.introfn))
+#endif
 				res = ast_play_and_wait(chan, "vm-msgsaved");
-#endif
 			}	
 		}
 	}
@@ -6552,7 +6553,7 @@
 		/*IMAP storage stores any prepended message from a forward
 		 * as a separate file from the rest of the message
 		 */
-		if (!ast_strlen_zero(vms->introfn)) {
+		if (!ast_strlen_zero(vms->introfn) && ast_fileexists(vms->introfn, NULL, NULL) > 0) {
 			wait_file(chan, vms, vms->introfn);
 		}
 #endif