diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-21 21:10:04 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-21 21:10:04 +0000 |
| commit | 1337d6ec9e9364df2847929273b9e7440d5d2215 (patch) | |
| tree | 3e55bc000fa16b234c322bfc7be931d673c0e12a /apps | |
| parent | 0e9df3f459c73c5f4ccc1e77f71a6cd38af1848e (diff) | |
Merged revisions 265090 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r265090 | mmichelson | 2010-05-21 16:08:51 -0500 (Fri, 21 May 2010) | 15 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@265091 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_queue.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index 797b08787..a60154cea 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -2028,6 +2028,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); |