[svn-commits] oej: branch 1.6.2 r286268 - in /branches/1.6.2: ./ main/file.c

[SVN commits to the Digium repositories]

Author: oej
Date: Sat Sep 11 12:05:16 2010
New Revision: 286268

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=286268
Log:
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:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/file.c

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

Modified: branches/1.6.2/main/file.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/file.c?view=diff&rev=286268&r1=286267&r2=286268
==============================================================================
--- branches/1.6.2/main/file.c (original)
+++ branches/1.6.2/main/file.c Sat Sep 11 12:05:16 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;