From 0932d899e661753dad52202aea24291c14af41fd Mon Sep 17 00:00:00 2001 From: Matthew Nicholson Date: Mon, 3 Oct 2011 15:42:01 +0000 Subject: Merged revisions 339043 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/10 ........ r339043 | mnicholson | 2011-10-03 10:41:36 -0500 (Mon, 03 Oct 2011) | 2 lines Don't clear the AST_FAX_TECH_MULTI_DOC flag right after we set it. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339044 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_fax.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'res') diff --git a/res/res_fax.c b/res/res_fax.c index d3359aea3..d177e717f 100644 --- a/res/res_fax.c +++ b/res/res_fax.c @@ -2224,10 +2224,6 @@ static int sendfax_exec(struct ast_channel *chan, const char *data) file_count++; } - if (file_count > 1) { - details->caps |= AST_FAX_TECH_MULTI_DOC; - } - ast_verb(3, "Channel '%s' sending FAX:\n", chan->name); AST_LIST_TRAVERSE(&details->documents, doc, next) { ast_verb(3, " %s\n", doc->filename); @@ -2235,6 +2231,10 @@ static int sendfax_exec(struct ast_channel *chan, const char *data) details->caps = AST_FAX_TECH_SEND; + if (file_count > 1) { + details->caps |= AST_FAX_TECH_MULTI_DOC; + } + /* check for debug */ if (ast_test_flag(&opts, OPT_DEBUG) || global_fax_debug) { details->option.debug = AST_FAX_OPTFLAG_TRUE; -- cgit v1.2.3