Merged revisions 72182 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r72182 | qwell | 2007-06-27 13:36:56 -0500 (Wed, 27 Jun 2007) | 4 lines Fix another problem in voicemail with missing symbols. Issue 10074, patch by kryptolus, extended to include #if 0'd blocks (just in case) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72183 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
7feaaaaf04
commit
37ebf4da54
1 changed files with 4 additions and 4 deletions
|
@ -8658,7 +8658,7 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re
|
||||||
/* User has hung up, no options to give */
|
/* User has hung up, no options to give */
|
||||||
if (!outsidecaller) {
|
if (!outsidecaller) {
|
||||||
/* user was recording a greeting and they hung up, so let's delete the recording. */
|
/* user was recording a greeting and they hung up, so let's delete the recording. */
|
||||||
vm_delete(tempfile);
|
ast_filedelete(tempfile, NULL);
|
||||||
}
|
}
|
||||||
return cmd;
|
return cmd;
|
||||||
}
|
}
|
||||||
|
@ -8673,14 +8673,14 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re
|
||||||
if (option_verbose > 2)
|
if (option_verbose > 2)
|
||||||
ast_verbose(VERBOSE_PREFIX_3 "Message too short\n");
|
ast_verbose(VERBOSE_PREFIX_3 "Message too short\n");
|
||||||
cmd = ast_play_and_wait(chan, "vm-tooshort");
|
cmd = ast_play_and_wait(chan, "vm-tooshort");
|
||||||
cmd = vm_delete(tempfile);
|
cmd = ast_filedelete(tempfile, NULL);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else if (vmu->review && (cmd == 2 && *duration < (maxsilence + 3))) {
|
else if (vmu->review && (cmd == 2 && *duration < (maxsilence + 3))) {
|
||||||
/* Message is all silence */
|
/* Message is all silence */
|
||||||
if (option_verbose > 2)
|
if (option_verbose > 2)
|
||||||
ast_verbose(VERBOSE_PREFIX_3 "Nothing recorded\n");
|
ast_verbose(VERBOSE_PREFIX_3 "Nothing recorded\n");
|
||||||
cmd = vm_delete(tempfile);
|
cmd = ast_filedelete(tempfile, NULL);
|
||||||
cmd = ast_play_and_wait(chan, "vm-nothingrecorded");
|
cmd = ast_play_and_wait(chan, "vm-nothingrecorded");
|
||||||
if (!cmd)
|
if (!cmd)
|
||||||
cmd = ast_play_and_wait(chan, "vm-speakup");
|
cmd = ast_play_and_wait(chan, "vm-speakup");
|
||||||
|
@ -8709,7 +8709,7 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re
|
||||||
case '*':
|
case '*':
|
||||||
/* Cancel recording, delete message, offer to take another message*/
|
/* Cancel recording, delete message, offer to take another message*/
|
||||||
cmd = ast_play_and_wait(chan, "vm-deleted");
|
cmd = ast_play_and_wait(chan, "vm-deleted");
|
||||||
cmd = vm_delete(tempfile);
|
cmd = ast_filedelete(tempfile, NULL);
|
||||||
if (outsidecaller) {
|
if (outsidecaller) {
|
||||||
res = vm_exec(chan, NULL);
|
res = vm_exec(chan, NULL);
|
||||||
return res;
|
return res;
|
||||||
|
|
Loading…
Reference in a new issue