From: Mark Spencer <markster@digium.com>
Date: Tue, 1 Jun 2004 19:38:06 +0000 (+0000)
Subject: Voicemail fixes (bug #1758)
X-Git-Tag: 1.0.0-rc1~331
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36b87b3b33c5db11591a2a6a0f8dcd9ab9d1829b;p=thirdparty%2Fasterisk.git

Voicemail fixes (bug #1758)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3124 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/app.c b/app.c
index c3686f12f5..2f3ac6cd7b 100755
--- a/app.c
+++ b/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;
 		}
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 4c688b0231..f9f20fc068 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)