Merge "app_voicemail: VoiceMailPlayMsg did not play database stored messages"

This commit is contained in:
zuul
2017-02-14 17:18:08 -06:00
committed by Gerrit Code Review

View File

@@ -11204,7 +11204,6 @@ static int play_message_by_id_helper(struct ast_channel *chan,
/* Found the msg, so play it back */
make_file(vms->fn, sizeof(vms->fn), vms->curdir, vms->curmsg);
make_file(vms->fn, sizeof(vms->fn), vms->curdir, vms->curmsg);
#ifdef IMAP_STORAGE
/*IMAP storage stores any prepended message from a forward
@@ -11214,6 +11213,8 @@ static int play_message_by_id_helper(struct ast_channel *chan,
wait_file(chan, vms, vms->introfn);
}
#endif
RETRIEVE(vms->curdir,vms->curmsg,vmu->mailbox, vmu->context);
if ((wait_file(chan, vms, vms->fn)) < 0) {
ast_log(AST_LOG_WARNING, "Playback of message %s failed\n", vms->fn);
} else {
@@ -11225,7 +11226,7 @@ static int play_message_by_id_helper(struct ast_channel *chan,
ast_mutex_unlock(&vms->lock);
#endif
}
DISPOSE(vms->curdir, vms->curmsg);
return 0;
}