mirror of
https://github.com/asterisk/asterisk.git
synced 2026-06-24 17:28:41 -07:00
Merge "app_voicemail: VoiceMailPlayMsg did not play database stored messages" into 14
This commit is contained in:
@@ -11206,7 +11206,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
|
||||
@@ -11216,6 +11215,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 {
|
||||
@@ -11227,7 +11228,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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user