Merged revisions 68401 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Fri, 8 Jun 2007 00:18:58 +0000 (00:18 +0000)
committerJoshua Colp <jcolp@digium.com>
Fri, 8 Jun 2007 00:18:58 +0000 (00:18 +0000)
commit154c1a7af591d6d0d857de98d28e83df61ef8a5a
treec07082e7e865af72149e0a0a8a613b6f2951853a
parent1d1566903e9f8587c2802fe8a3e0a1272d2c390f
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
main/say.c