From a6059a815b240ac476ba8aff43afc0e6ef926646 Mon Sep 17 00:00:00 2001 From: mmichelson Date: Tue, 3 Mar 2009 22:49:32 +0000 Subject: Merged revisions 180007 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r180007 | mmichelson | 2009-03-03 16:49:07 -0600 (Tue, 03 Mar 2009) | 22 lines 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/branches/1.6.0@180008 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_queue.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'apps/app_queue.c') diff --git a/apps/app_queue.c b/apps/app_queue.c index 24fe45afa..89221459f 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -1788,6 +1788,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); -- cgit v1.2.3