diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-06-01 19:38:06 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-06-01 19:38:06 +0000 |
commit | 6978b11051e5adcdca3896e7b2f04f08d00044cf (patch) | |
tree | 307a3af3f267bfd600d2a4e66d2e3d70afc94248 | |
parent | 4579b5ca619ff3b55b3f3f8572c2f45854386e44 (diff) |
Voicemail fixes (bug #1758)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3124 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | app.c | 6 | ||||
-rwxr-xr-x | apps/app_voicemail.c | 2 |
2 files changed, 5 insertions, 3 deletions
@@ -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; } diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 4c688b023..f9f20fc06 100755 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -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) |