From 2ac71f54e38e096eed6e3a46fd88f325fc6dd713 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Sun, 10 Mar 2024 20:27:03 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=A7=A3=E5=86=B3=E5=9B=BD=E4=BA=A7?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=8F=8C=E5=BC=A0=E4=BF=9D=E7=95=99=E5=90=8E?=
 =?UTF-8?q?=E6=8A=A5=E6=97=A0=E7=BA=B8=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=9BBUG-919=202=E3=80=81=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E5=9B=BD=E4=BA=A7=E7=B3=BB=E7=BB=9F=EF=BC=8C=E5=AE=89=E5=8D=93?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AC=AC=E4=B8=80=E6=AC=A1=E6=89=AB=E6=8F=8F?=
 =?UTF-8?q?=E6=97=B6=E5=8F=8C=E5=BC=A0=E6=8A=A5=E6=89=AB=E6=8F=8F=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9BBUG-931?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/sane_user/HGSaneImpl.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/modules/sane_user/HGSaneImpl.cpp b/modules/sane_user/HGSaneImpl.cpp
index f70a773b..cc4c2f46 100644
--- a/modules/sane_user/HGSaneImpl.cpp
+++ b/modules/sane_user/HGSaneImpl.cpp
@@ -1019,7 +1019,10 @@ void HGAPI HGSaneDeviceImpl::ThreadFunc(HGThread thread, HGPointer param)
         if ((SCANNER_ERR_DEVICE_DOUBLE_FEEDING == stat && HGSANE_ERR_UI_RESERVE_CHECK != doubleImgStat))
         {
             if (NULL != p->m_scanNotify)
+            {
                 p->m_scanNotify((int)SANE_EVENT_SCAN_FINISHED, (void*)saneAPI.sane_strstatus_api(stat), (int)stat);
+                return;
+            }
 
             if (HGSANE_ERR_UI_DISCARD_STOP == doubleImgStat)
                 return;
@@ -1172,7 +1175,17 @@ void HGAPI HGSaneDeviceImpl::ThreadFunc(HGThread thread, HGPointer param)
 
         if (!p->m_cancelScan)
         {
-            stat = saneAPI.sane_start_api(p->m_devHandle);
+            if (stat == SANE_STATUS_GOOD)
+            {
+                 stat = saneAPI.sane_start_api(p->m_devHandle);
+            }
+            else if (stat != SANE_STATUS_GOOD)
+            {
+                stat = saneAPI.sane_start_api(p->m_devHandle);
+                if (stat == SANE_STATUS_NO_DOCS)
+                    stat = saneAPI.sane_start_api(p->m_devHandle);
+            }
+
             if (SANE_STATUS_NO_DOCS == stat)
             {
                 if (NULL != p->m_scanNotify)