Bug 837: bail out if the high-speed carrier is not found

diff --git a/faxd/Class1Recv.c++ b/faxd/Class1Recv.c++
index 81d0bfeb28d26e5f6c6736d1430e7534d95ef1d3..4186905e33ca1fdab838f375e3cf7edab9ae37ed 100644 (file)
--- a/faxd/Class1Recv.c++
+++ b/faxd/Class1Recv.c++
@@ -1146,8 +1146,9 @@ Class1Modem::recvPageECMData(TIFF* tif, const Class2Params& params, fxStr& emsg)
                        } else
                            gotprimary = false;
                    }
-                   if (!gotprimary && !sendERR && useV34) {
-                       emsg = "Failed to properly open V.34 primary channel.";
+                   if (!gotprimary && !sendERR) {
+                       if (useV34) emsg = "Failed to properly open V.34 primary channel.";
+                       else emsg = "Failed to properly detect high-speed data carrier.";
                        protoTrace(emsg);
                        if (conf.saveUnconfirmedPages && pagedataseen) {
                            protoTrace("RECV keeping unconfirmed page");