If imapfolder=foo were set in voicemail.conf, then when calling VoiceMailMain,

app_voicemail would attempt to play a file called vm-foo instead of playing
vm-INBOX to play the "new" sound file. This commit fixes that issue.

This may fix one of the problems reported in issue #12987

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@128731 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 53f189d..75f4131 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -5918,10 +5918,14 @@ static void imap_mailbox_name(char *spec, size_t len, struct vm_state *vms, int
 
        if (box == OLD_FOLDER) {
                ast_copy_string(vms->curbox, mbox(NEW_FOLDER), sizeof(vms->curbox));
-               snprintf(vms->vmbox, sizeof(vms->vmbox), "vm-%s", mbox(1));
        } else {
                ast_copy_string(vms->curbox, mbox(box), sizeof(vms->curbox));
-               snprintf(vms->vmbox, sizeof(vms->vmbox), "vm-%s", vms->curbox);
+       }
+
+       if (box == NEW_FOLDER) {
+               ast_copy_string(vms->vmbox, "vm-INBOX", sizeof(vm->vmbox));
+       } else {
+               snprintf(vms->vmbox, sizeof(vm->vmbox), "vm-%s", mbox(box));
        }
 
        /* Build up server information */