From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 8 Oct 2004 00:05:36 +0000 (+0000)
Subject: voicemail beep shouldn't be played till we get next message number (bug #2594)
X-Git-Tag: 1.0.11.1~450
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17a3454b924f8ae694561912ce2680df895d26b8;p=thirdparty%2Fasterisk.git

voicemail beep shouldn't be played till we get next message number (bug #2594)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@3942 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index fef41ac747..7eb2a35640 100755
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -1417,12 +1417,6 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, int silent, int
 			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 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, int silent, int
 					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);