sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged revisions 265089 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r265089 | mmichelson | 2010-05-21 15:59:14 -0500 (Fri, 21 May 2010) | 8 lines
  
  Don't hang up on a queue caller if the file we attempt to play does not exist.
  
  This also fixes a documentation mistake in file.h that made my original attempt
  to correct this problem not work correctly.
  
  (closes issue #17061)
  Reported by: RoadKill
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@265090 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson 2010-05-21 21:08:51 +00:00
parent ee60cb8d41
commit 1225ee831c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/app_queue.c
View File

@ -2346,6 +2346,10 @@ static int play_file(struct ast_channel *chan, const char *filename)
return 0;
}
if (!ast_fileexists(filename, NULL, chan->language)) {
return 0;
}
ast_stopstream(chan);
res = ast_streamfile(chan, filename, chan->language);

2
include/asterisk/file.h
View File

@ -90,7 +90,7 @@ int ast_stopstream(struct ast_channel *c);
* \param fmt the format you wish to check (the extension)
* \param preflang (the preferred language you wisht to find the file in)
* See if a given file exists in a given format. If fmt is NULL, any format is accepted.
* \return -1 if file does not exist, non-zero positive otherwise.
* \return 0 if file does not exist, non-zero positive otherwise.
*/
int ast_fileexists(const char *filename, const char *fmt, const char *preflang);