[svn-commits] mmichelson: branch 1.4 r265089 - in /branches/1.4: apps/ include/asterisk/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri May 21 15:59:14 2010
New Revision: 265089

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=265089
Log:
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.


Modified:
    branches/1.4/apps/app_queue.c
    branches/1.4/include/asterisk/file.h

Modified: branches/1.4/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/apps/app_queue.c?view=diff&rev=265089&r1=265088&r2=265089
==============================================================================
--- branches/1.4/apps/app_queue.c (original)
+++ branches/1.4/apps/app_queue.c Fri May 21 15:59:14 2010
@@ -1529,6 +1529,10 @@
 	int res;
 
 	if (ast_strlen_zero(filename)) {
+		return 0;
+	}
+
+	if (!ast_fileexists(filename, NULL, chan->language)) {
 		return 0;
 	}
 

Modified: branches/1.4/include/asterisk/file.h
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/include/asterisk/file.h?view=diff&rev=265089&r1=265088&r2=265089
==============================================================================
--- branches/1.4/include/asterisk/file.h (original)
+++ branches/1.4/include/asterisk/file.h Fri May 21 15:59:14 2010
@@ -199,7 +199,7 @@
  * \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.
- * Returns -1 if file does not exist, non-zero positive otherwise.
+ * Returns 0 if file does not exist, non-zero positive otherwise.
  */
 int ast_fileexists(const char *filename, const char *fmt, const char *preflang);