[svn-commits] oej: branch 1.4 r286267 - /branches/1.4/main/file.c

[SVN commits to the Digium repositories]

Author: oej
Date: Sat Sep 11 11:59:20 2010
New Revision: 286267

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=286267
Log:
Handle error response when we can't make file compatible

Review: https://reviewboard.asterisk.org/r/911/

Modified:
    branches/1.4/main/file.c

Modified: branches/1.4/main/file.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/file.c?view=diff&rev=286267&r1=286266&r2=286267
==============================================================================
--- branches/1.4/main/file.c (original)
+++ branches/1.4/main/file.c Sat Sep 11 11:59:20 2010
@@ -668,7 +668,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;