Merged revisions 339043 via svnmerge from
authorMatthew Nicholson <mnicholson@digium.com>
Mon, 3 Oct 2011 15:42:01 +0000 (15:42 +0000)
committerMatthew Nicholson <mnicholson@digium.com>
Mon, 3 Oct 2011 15:42:01 +0000 (15:42 +0000)
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

index d3359ae..d177e71 100644 (file)
@@ -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;