Bug 557: morePages is false at the end of a document even when there are

         more documents - don't be fooled by this

diff --git a/faxd/Class1Send.c++ b/faxd/Class1Send.c++
index 15e3ac08458de7f07b539bbfc031c34daa4f6169..fa97f204fb8992e212074d5f3f20f66ac1c74e3b 100644 (file)
--- a/faxd/Class1Send.c++
+++ b/faxd/Class1Send.c++
@@ -394,14 +394,16 @@ Class1Modem::sendPhaseB(TIFF* tif, Class2Params& next, FaxMachineInfo& info,
                    pph.remove(0,3);    // discard page-handling info
                if (params.ec == EC_DISABLE) atCmd(conf.class1SwitchingCmd, AT_OK);
                ntrys = 0;
-               if (morePages) {
-                   if (ppr == FCF_PIP) {
-                       emsg = "Procedure interrupt (operator intervention)";
+               if (morePages) {        // meaning, more pages in this file, but there may be other files
+                   if (!TIFFReadDirectory(tif)) {
+                       emsg = "Problem reading document directory";
                        protoTrace(emsg);
                        return (send_failed);
                    }
-                   if (!TIFFReadDirectory(tif)) {
-                       emsg = "Problem reading document directory";
+               }
+               if (cmd != FCF_EOP) {
+                   if (ppr == FCF_PIP) {
+                       emsg = "Procedure interrupt (operator intervention)";
                        protoTrace(emsg);
                        return (send_failed);
                    }