* don't exit faxq with assertion failure when a job times out and is

  interrupted during sending

diff --git a/CHANGES b/CHANGES
index f7aa86435521bafe780e12097a1ea96fbd4aa99a..c90946adf56d4845eff1cc887f758360a67877b1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
 
 Changelog since HylaFAX 4.3.0
 
+* don't exit faxq with assertion failure when a job times out and is
+  interrupted during sending (21 Jul 2006)
 * faxaddmodem: Allow identification when no AT+FMM? or AT+FMI? (21 Jul 2006)
 * fix error of accepting too-short of DCS signal (20 Jul 2006)
 * fix faxgetty hang in ECM due to missing timeouts (20 Jul 2006)

diff --git a/faxd/faxQueueApp.c++ b/faxd/faxQueueApp.c++
index 31e32e083c42ba43f3c2ca2d1c3c63391cfb174f..53bdbb21184e68f644ed2e637f4013c5f1662ea1 100644 (file)
--- a/faxd/faxQueueApp.c++
+++ b/faxd/faxQueueApp.c++
@@ -1501,14 +1501,13 @@ faxQueueApp::sendJobDone(Job& job, FaxRequest* req)
        req->notice = "Job interrupted by user";
        req->status = send_retry;
     }
-    if (job.killtime == 0 && req->status == send_retry) {
+    if (job.killtime == 0 && !job.suspendPending && req->status == send_retry) {
        /*
         * The job timed out during the send attempt.  We
         * couldn't do anything then, but now the job can
         * be cleaned up.  Not sure if the user should be
         * notified of the requeue as well as the timeout?
         */
-       fxAssert(!job.suspendPending, "Interrupted job timed out");
        job.state = FaxRequest::state_failed;
        deleteRequest(job, req, Job::timedout, true);
        setDead(job);