issue #5663

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7078 f38db490-d61c-443f-a65b-d21fe96a405b

2 files changed, 13 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 3e4509b9a..f51ed4d25 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-11  Kevin P. Fleming  <kpfleming@digium.com>
+
+	* apps/app_voicemail.c (close_mailbox): properly remove deleted messages at mailbox close time (issue #5663)
+
 2005-11-11  Mark Spencer <markster@digium.com>
 
 	* channels/chan_zap.c (zt_bridge): only enable/disable DTMF detection on SUB_REAL channels
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index b30d69df8..b4b77c71d 100755
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -3869,7 +3869,7 @@ static int open_mailbox(struct vm_state *vms, struct ast_vm_user *vmu,int box)
 
 static int close_mailbox(struct vm_state *vms, struct ast_vm_user *vmu)
 {
-	int x;
+	int x, nummsg;
 	int res = 0;
 
 	if (vms->lastmsg <= -1)
@@ -3902,12 +3902,14 @@ static int close_mailbox(struct vm_state *vms, struct ast_vm_user *vmu)
 			} 
 		} 
 	} 
-	for (x = vms->curmsg + 1; x <= vmu->maxmsg; x++) { 
-		make_file(vms->fn, sizeof(vms->fn), vms->curdir, x); 
-		if (!EXISTS(vms->curdir, x, vms->fn, NULL)) 
-			break;
-		DELETE(vms->curdir, x, vms->fn);
-	} 
+
+	/* Delete ALL remaining messages */
+	nummsg = x;
+	for (x = vms->curmsg + 1; x <= nummsg; x++) {
+		make_file(vms->fn, sizeof(vms->fn), vms->curdir, x);
+		if (EXISTS(vms->curdir, x, vms->fn, NULL))
+			DELETE(vms->curdir, x, vms->fn);
+	}
 	ast_unlock_path(vms->curdir);
 
 done: