Bug 626: logic correction to non-V.34 error handling for unexpected

         signal reception error

diff --git a/faxd/Class1Recv.c++ b/faxd/Class1Recv.c++
index dc92d929a9189ea8f079c4ede0192965c202921f..dcdc3041f6ff1159c7f1ccd617de16dd290cc2ab 100644 (file)
--- a/faxd/Class1Recv.c++
+++ b/faxd/Class1Recv.c++
@@ -1151,8 +1151,14 @@ Class1Modem::recvPageECMData(TIFF* tif, const Class2Params& params, fxStr& emsg)
                            }
                        } else {
                            gotprimary = false;
-                           if (!useV34 && !(lastResponse == AT_NOCARRIER || 
-                               lastResponse == AT_ERROR || !atCmd(rhCmd, AT_CONNECT))) break;
+                           if (!useV34) {
+                               if (wasTimeout()) {
+                                   abortReceive();
+                                   break;
+                               }
+                               if (lastResponse == AT_NOCARRIER || lastResponse == AT_ERROR ||
+                                   !atCmd(rhCmd, AT_CONNECT, conf.t1Timer))) break;
+                           }
                        }
                    }
                    if (!gotprimary && !sendERR) {