[Asterisk-cvs] asterisk/apps app_voicemail.c,1.151,1.151.2.1

[russell at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv20685/apps

Modified Files:
      Tag: v1-0
	app_voicemail.c 
Log Message:
voicemail beep shouldn't be played till we get next message number (bug #2594)


Index: app_voicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.151
retrieving revision 1.151.2.1
diff -u -d -r1.151 -r1.151.2.1
--- app_voicemail.c	30 Sep 2004 04:00:41 -0000	1.151
+++ app_voicemail.c	8 Oct 2004 00:05:36 -0000	1.151.2.1
@@ -1417,12 +1417,6 @@
 			free_user(vmu);
 			return 0;
 		}
-		if (res >= 0) {
-			/* Unless we're *really* silent, try to send the beep */
-			res = ast_streamfile(chan, "beep", chan->language);
-			if (!res)
-				res = ast_waitstream(chan, "");
-		}
 		if (res < 0) {
 			free_user(vmu);
 			return -1;
@@ -1437,6 +1431,12 @@
 					break;
 				msgnum++;
 			} while(msgnum < MAXMSG);
+			if (res >= 0) {
+				/* Unless we're *really* silent, try to send the beep */
+				res = ast_streamfile(chan, "beep", chan->language);
+				if (!res)
+					res = ast_waitstream(chan, "");
+			}	
 			if (msgnum < MAXMSG) {
 				/* Store information */
 				snprintf(txtfile, sizeof(txtfile), "%s.txt", fn);