From 5346dc4f04e19f3e96fb17019f9b23f24256d91f Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@jon.demon.co.uk>
Date: Wed, 14 Jun 2006 21:02:59 +0000
Subject: [PATCH] break out of sane_start wait loop in case of cancellation

---
 backend/dell1600n_net.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/backend/dell1600n_net.c b/backend/dell1600n_net.c
index 0b9624cd3..954eec05a 100644
--- a/backend/dell1600n_net.c
+++ b/backend/dell1600n_net.c
@@ -112,6 +112,7 @@ struct ScannerState
   int m_numPages;	        /* number of complete pages (host byte order) */
   struct ComBuf m_pageInfo;	/* "array" of numPages PageInfo structs */
   int m_bFinish;		/* set non-0 to signal that we are finished */
+  int m_bCancelled;		/* set non-0 that bFinish state arose from cancelation */
   char m_regName[REG_NAME_SIZE];	/* name with which to register */
   unsigned short m_xres;	/* x resolution (network byte order) */
   unsigned short m_yres;	/* y resolution (network byte order) */
@@ -686,6 +687,8 @@ sane_start (SANE_Handle handle)
       selTimeVal.tv_sec = 1;
       selTimeVal.tv_usec = 0;
 
+
+
       DBG (5, "sane_start: waiting for scan signal\n");
 
       /* wait again if nothing received */
@@ -713,11 +716,18 @@ sane_start (SANE_Handle handle)
     }				/* while */
 
 
+  /* check whether we were cancelled */
+  if ( gOpenScanners[iHandle]->m_bCancelled ) status = SANE_STATUS_CANCELLED;
+
+
 cleanup:
 
   FreeComBuf (&buf);
 
 
+  
+
+
   return status;
 
 }				/* sane_start */
@@ -801,7 +811,14 @@ sane_read (SANE_Handle handle, SANE_Byte * data,
 void
 sane_cancel (SANE_Handle handle)
 {
-  DBG( 5, "sane_cancel: %x\n", (int)handle );
+  int iHandle = (int) handle;
+
+  DBG( 5, "sane_cancel: %x\n", iHandle );
+
+  /* signal that bad things are afoot */
+  gOpenScanners[iHandle]->m_bFinish = 1;
+  gOpenScanners[iHandle]->m_bCancelled = 1;
+
 }				/* sane_cancel */
 
 /***********************************************************/