From: Automerge script <automerge@asterisk.org>
Date: Tue, 25 Sep 2012 21:25:18 +0000 (+0000)
Subject: Merged revisions 373737 via svnmerge from
X-Git-Tag: 10.10.0-digiumphones-rc1~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6128a98e508a99485bf1b7797dd096ccf9730073;p=thirdparty%2Fasterisk.git

Merged revisions 373737 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

................
  r373737 | mmichelson | 2012-09-25 16:12:40 -0500 (Tue, 25 Sep 2012) | 11 lines

  Fix error where improper IMAP greetings would be deleted.

  (closes issue ASTERISK-20435)
  Reported by: fhackenberger
  Patches:
  	asterisk-20435-imap-del-greeting.diff uploaded by Michael L. Young (License #5026)
  	(with suggested modification made by me)
  ........

  Merged revisions 373735 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@373765 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 76e05a02c6..5a9539fc7d 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -1854,6 +1854,11 @@ static void vm_imap_delete(char *file, int msgnum, struct ast_vm_user *vmu)
 		return;
 	}
 
+	if (msgnum < 0) {
+		imap_delete_old_greeting(file, vms);
+		return;
+	}
+
 	/* find real message number based on msgnum */
 	/* this may be an index into vms->msgArray based on the msgnum. */
 	messageNum = vms->msgArray[msgnum];