Voicemail fixes (bug #1758)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3124 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
4579b5ca61
commit
6978b11051
6
app.c
6
app.c
|
@ -459,7 +459,9 @@ int ast_control_streamfile(struct ast_channel *chan, char *file, char *fwd, char
|
|||
if (chan)
|
||||
ast_stopstream(chan);
|
||||
res = ast_waitfordigit(chan, 1000);
|
||||
if (res == -1 || strchr(pause, res) || (stop && strchr(stop, res)))
|
||||
if(res == 0)
|
||||
continue;
|
||||
else if(res == -1 || strchr(pause, res) || (stop && strchr(stop, res)))
|
||||
break;
|
||||
}
|
||||
if (res == *pause) {
|
||||
|
@ -470,7 +472,7 @@ int ast_control_streamfile(struct ast_channel *chan, char *file, char *fwd, char
|
|||
if (res == -1)
|
||||
break;
|
||||
|
||||
if (stop != NULL && res == *stop) {
|
||||
if (stop && strchr(stop, res)) {
|
||||
res = 0;
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -2572,7 +2572,7 @@ static int wait_file2(struct ast_channel *chan, struct vm_state *vms, char *file
|
|||
|
||||
static int wait_file(struct ast_channel *chan, struct vm_state *vms, char *file)
|
||||
{
|
||||
return ast_control_streamfile(chan, file, "#", "*", "1", "0", skipms);
|
||||
return ast_control_streamfile(chan, file, "#", "*", "14679", "0", skipms);
|
||||
}
|
||||
|
||||
static int play_message_datetime(struct ast_channel *chan, struct ast_vm_user *vmu, char *origtime, char *filename)
|
||||
|
|
Reference in New Issue