[asterisk-commits] mnicholson: trunk r280910 - in /trunk: ./ res/res_fax.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Wed Aug  4 10:22:02 2010
New Revision: 280910

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

........
  r280909 | mnicholson | 2010-08-04 10:11:13 -0500 (Wed, 04 Aug 2010) | 2 lines
  
  Initialize FAXOPT() status variables in sendfax and receivefax instead of when the details structure is created.
........

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

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

Modified: trunk/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_fax.c?view=diff&rev=280910&r1=280909&r2=280910
==============================================================================
--- trunk/res/res_fax.c (original)
+++ trunk/res/res_fax.c Wed Aug  4 10:22:02 2010
@@ -387,9 +387,6 @@
 	d->modems = general_options.modems;
 	d->minrate = general_options.minrate;
 	d->maxrate = general_options.maxrate;
-	ast_string_field_set(d, result, "FAILED");
-	ast_string_field_set(d, resultstr, "error starting fax session");
-	ast_string_field_set(d, error, "INIT_ERROR");
 
 	return d;
 }
@@ -1390,6 +1387,10 @@
 		return -1;
 	}
 
+	ast_string_field_set(details, result, "FAILED");
+	ast_string_field_set(details, resultstr, "error starting fax session");
+	ast_string_field_set(details, error, "INIT_ERROR");
+
 	set_channel_variables(chan, details);
 
 	if (ast_strlen_zero(data)) {
@@ -1795,6 +1796,9 @@
 		return -1;
 	}
 
+	ast_string_field_set(details, result, "FAILED");
+	ast_string_field_set(details, resultstr, "error starting fax session");
+	ast_string_field_set(details, error, "INIT_ERROR");
 	set_channel_variables(chan, details);
 
 	if (ast_strlen_zero(data)) {