]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 373737 via svnmerge from
authorAutomerge script <automerge@asterisk.org>
Tue, 25 Sep 2012 21:25:18 +0000 (21:25 +0000)
committerAutomerge script <automerge@asterisk.org>
Tue, 25 Sep 2012 21:25:18 +0000 (21:25 +0000)
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

apps/app_voicemail.c

index 76e05a02c62809148a49dd8f93d9938f93c2bd6a..5a9539fc7daf2eff9cba4b3faaa11786d6189664 100644 (file)
@@ -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];