diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-03 22:49:07 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-03 22:49:07 +0000 |
commit | 684ada3355bf55f59038a0a2adb021e75bacd54f (patch) | |
tree | 751f3f733e6fd73e635b70af1ed7b139e42f44fa /apps/app_queue.c | |
parent | 3d188dd5c61aed77cae9e4eee9bdfeeba39b2030 (diff) |
Merged revisions 180006 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r180006 | mmichelson | 2009-03-03 16:48:18 -0600 (Tue, 03 Mar 2009) | 17 lines
Clarify some documentation of queues.conf.sample
It had always been possible to explicitly specify a "blank"
value for a sound file in queues.conf and have no sound played
back. The problem with this is that it would result in some ugly
CLI warnings from file.c.
This commit introduces a check when playing a file in app_queue
to see if the name of the file is zero-length and return early if
that is the case. Also, the ability to specify the blank sound
files in queues.conf is now mentioned more clearly in queues.conf.sample
(closes issue #14227)
Reported by: caspy
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@180007 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_queue.c')
-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 58b68cda3..6b7ddd5c6 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -1974,6 +1974,10 @@ static int play_file(struct ast_channel *chan, const char *filename) { int res; + if (ast_strlen_zero(filename)) { + return 0; + } + ast_stopstream(chan); res = ast_streamfile(chan, filename, chan->language); |