[svn-commits] file: trunk r38826 - in /trunk: ./ res/res_musiconhold.c

[svn-commits at lists.digium.com]

Author: file
Date: Thu Aug  3 14:55:05 2006
New Revision: 38826

URL: http://svn.digium.com/view/asterisk?rev=38826&view=rev
Log:
Merged revisions 38825 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r38825 | file | 2006-08-03 15:54:02 -0400 (Thu, 03 Aug 2006) | 2 lines

Treat the file as invalid if we have no valid formats for it (issue #7643 reported by KNK)

........

Modified:
    trunk/   (props changed)
    trunk/res/res_musiconhold.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/res/res_musiconhold.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_musiconhold.c?rev=38826&r1=38825&r2=38826&view=diff
==============================================================================
--- trunk/res/res_musiconhold.c (original)
+++ trunk/res/res_musiconhold.c Thu Aug  3 14:55:05 2006
@@ -234,7 +234,7 @@
 			state->pos %= state->class->total_files;
 
 			/* check to see if this file's format can be opened */
-			if (ast_fileexists(state->class->filearray[state->pos], NULL, NULL) != -1)
+			if (ast_fileexists(state->class->filearray[state->pos], NULL, NULL) > 0)
 				break;
 
 		}