Bug 657: don't save null data pages when in non-ECM the data carrier

         cannot be detected

diff --git a/CHANGES b/CHANGES
index 698d5719cc856fc706376dff19a0d05a5c3e4e1c..4982083989451faef39805c0ac4f150f7eb090f5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,7 +4,7 @@ Changelog for HylaFAX 4.2.2
 
 * send PPR instead of DCN when an empty block is received (1 Jun 2005)
 * fix some dysfunctional mail redirects (30 May 2005)
-* don't save null-data pages (26 May 2005)
+* don't save null-data pages (26 May, 6 Jun 2005)
 * Add support for OpenServer 6 (24 May 2005)
 * update config.guess and config.sub to current versions (24 May 2005)
 * add Rockwell/Conexant Class 1.0 prototype config (18 May 2005)

diff --git a/faxd/Class1Recv.c++ b/faxd/Class1Recv.c++
index 9b572d41c6f3975088c7e7d6ccaf2cb2c8de778a..eb8bede8618cf2cc2eb070765e231f642e8c29ba 100644 (file)
--- a/faxd/Class1Recv.c++
+++ b/faxd/Class1Recv.c++
@@ -485,6 +485,7 @@ Class1Modem::recvPage(TIFF* tif, u_int& ppm, fxStr& emsg, const fxStr& id)
                sendCFR = false;
            }
            pageGood = false;
+           resetLineCounts();          // in case we don't make it to initializeDecoder
            recvSetupTIFF(tif, group3opts, FILLORDER_LSB2MSB, id);
            ATResponse rmResponse = AT_NOTHING;
            if (params.ec != EC_DISABLE || useV34) {
@@ -1680,7 +1681,6 @@ Class1Modem::recvPageData(TIFF* tif, fxStr& emsg)
      * T.30-A ECM mode requires a substantially different protocol than non-ECM faxes.
      */
     if (params.ec != EC_DISABLE) {
-       resetLineCounts();      // in case we don't make it to initializeDecoder
        if (!recvPageECMData(tif, params, emsg)) {
            /*
             * The previous page experienced some kind of error.  Falsify