From: Joshua Colp <jcolp@digium.com>
Date: Fri, 8 Jun 2007 00:18:58 +0000 (+0000)
Subject: Merged revisions 68401 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2420
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=154c1a7af591d6d0d857de98d28e83df61ef8a5a;p=thirdparty%2Fasterisk.git

Merged revisions 68401 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r68401 | file | 2007-06-07 20:17:04 -0400 (Thu, 07 Jun 2007) | 10 lines

Merged revisions 68397 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r68397 | file | 2007-06-07 20:15:33 -0400 (Thu, 07 Jun 2007) | 2 lines

Don't call ast_waitstream_full when the control file descriptor and audio file descriptor are not set, simply call ast_waitstream! (issue #8530 reported by rickead2000)

........

................


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

diff --git a/main/say.c b/main/say.c
index fdc142d5f4..340b5faa09 100644
--- a/main/say.c
+++ b/main/say.c
@@ -125,8 +125,12 @@ static int say_character_str_full(struct ast_channel *chan, const char *str, con
 			fn = fnbuf;
 		}
 		res = ast_streamfile(chan, fn, lang);
-		if (!res) 
-			res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
+		if (!res) {
+			if ((audiofd  > -1) && (ctrlfd > -1))
+				res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
+			else
+				res = ast_waitstream(chan, ints);
+		}
 		ast_stopstream(chan);
 		num++;
 	}
@@ -199,8 +203,12 @@ static int say_phonetic_str_full(struct ast_channel *chan, const char *str, cons
 			fn = fnbuf;
 		}
 		res = ast_streamfile(chan, fn, lang);
-		if (!res) 
-			res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
+		if (!res) {
+			if ((audiofd  > -1) && (ctrlfd > -1))
+				res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
+			else
+				res = ast_waitstream(chan, ints);
+		}
 		ast_stopstream(chan);
 		num++;
 	}
@@ -244,8 +252,12 @@ static int say_digit_str_full(struct ast_channel *chan, const char *str, const c
 		}
 		if (fn) {
 			res = ast_streamfile(chan, fn, lang);
-			if (!res) 
-				res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
+			if (!res) {
+				if ((audiofd  > -1) && (ctrlfd > -1))
+                                        res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
+                                else
+                                        res = ast_waitstream(chan, ints);
+			}
 			ast_stopstream(chan);
 		}
 		num++;