This update fixes the problem reported in bug 8551; that ast_app_getdata() behaves differently in trunk for the case of a null prompt.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48388 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Steve Murphy
2006-12-11 17:00:36 +00:00
parent 496d3e72f2
commit 2c332f0200

View File

@@ -115,14 +115,16 @@ int ast_app_getdata(struct ast_channel *c, const char *prompt, char *s, int maxl
if (maxlen)
s[0] = '\0';
if (ast_strlen_zero(prompt))
return -1;
if (!prompt)
prompt="";
filename = ast_strdupa(prompt);
while ((front = strsep(&filename, "&"))) {
res = ast_streamfile(c, front, c->language);
if (res)
continue;
if (!ast_strlen_zero(front)) {
res = ast_streamfile(c, front, c->language);
if (res)
continue;
}
if (ast_strlen_zero(filename)) {
/* set timeouts for the last prompt */
fto = c->pbx ? c->pbx->rtimeout * 1000 : 6000;