[asterisk-commits] oej: trunk r286272 - in /trunk: ./ main/file.c

[SVN commits to the Asterisk project]

Author: oej
Date: Sat Sep 11 12:12:58 2010
New Revision: 286272

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=286272
Log:
Merged revisions 286270 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r286270 | oej | 2010-09-11 19:09:22 +0200 (Lör, 11 Sep 2010) | 18 lines
  
  Merged revisions 286268 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r286268 | oej | 2010-09-11 19:05:16 +0200 (Lör, 11 Sep 2010) | 11 lines
    
    Merged revisions 286267 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r286267 | oej | 2010-09-11 18:59:20 +0200 (Lör, 11 Sep 2010) | 4 lines
      
      Handle error response when we can't make file compatible
      
      Review: https://reviewboard.asterisk.org/r/911/
    ........
  ................
................

Modified:
    trunk/   (props changed)
    trunk/main/file.c

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

Modified: trunk/main/file.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/file.c?view=diff&rev=286272&r1=286271&r2=286272
==============================================================================
--- trunk/main/file.c (original)
+++ trunk/main/file.c Sat Sep 11 12:12:58 2010
@@ -653,7 +653,10 @@
 	chan->oldwriteformat = chan->writeformat;
 	/* Set the channel to a format we can work with */
 	res = ast_set_write_format(chan, fmts);
- 	res = ast_filehelper(buf, chan, NULL, ACTION_OPEN);
+	if (res == -1) {	/* No format available that works with this channel */
+		return NULL;
+	}
+	res = ast_filehelper(buf, chan, NULL, ACTION_OPEN);
 	if (res >= 0)
 		return chan->stream;
 	return NULL;