[asterisk-commits] mmichelson: branch 1.6.2 r265091 - in /branches/1.6.2: ./ apps/ include/aster...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Fri May 21 16:10:04 2010
New Revision: 265091

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

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/apps/app_queue.c
    branches/1.6.2/include/asterisk/file.h

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/apps/app_queue.c?view=diff&rev=265091&r1=265090&r2=265091
==============================================================================
--- branches/1.6.2/apps/app_queue.c (original)
+++ branches/1.6.2/apps/app_queue.c Fri May 21 16:10:04 2010
@@ -2028,6 +2028,10 @@
 		return 0;
 	}
 
+	if (!ast_fileexists(filename, NULL, chan->language)) {
+		return 0;
+	}
+
 	ast_stopstream(chan);
 
 	res = ast_streamfile(chan, filename, chan->language);

Modified: branches/1.6.2/include/asterisk/file.h
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/include/asterisk/file.h?view=diff&rev=265091&r1=265090&r2=265091
==============================================================================
--- branches/1.6.2/include/asterisk/file.h (original)
+++ branches/1.6.2/include/asterisk/file.h Fri May 21 16:10:04 2010
@@ -90,7 +90,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.
- * \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);