From: Kevin P. Fleming Date: Fri, 11 Nov 2005 21:04:10 +0000 (+0000) Subject: issue #5663 X-Git-Tag: 1.2.0-rc2~13 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f45949ca1c68eb72a518ae660716b391fa39e21;p=thirdparty%2Fasterisk.git issue #5663 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7078 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/ChangeLog b/ChangeLog index 3e4509b9ab..f51ed4d253 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-11-11 Kevin P. Fleming + + * apps/app_voicemail.c (close_mailbox): properly remove deleted messages at mailbox close time (issue #5663) + 2005-11-11 Mark Spencer * 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 b30d69df8d..b4b77c71d4 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: