From eb4f37e48ad4f2862d8bfdf2cc13a9af5a58fbd1 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Tue, 1 Aug 2023 17:16:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=9B=BD=E4=BA=A7=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=89=AB=E6=8F=8F=E6=B5=81=E7=A8=8B=E4=B8=8D=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E5=92=8C=E5=8F=AA=E6=9C=89=E4=B8=80=E5=8F=B0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=97=B6=E9=80=89=E6=8B=A9=E6=BA=90=E4=B8=8D=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scanner2/device_user.cpp          | 26 +++++++++++++-------------
 modules/saneui/dialog_device_scan.cpp |  7 ++++++-
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/app/scanner2/device_user.cpp b/app/scanner2/device_user.cpp
index 603a60a7..7bc0c8a6 100644
--- a/app/scanner2/device_user.cpp
+++ b/app/scanner2/device_user.cpp
@@ -176,20 +176,20 @@ class DeviceUser* DeviceUserMgr::OpenDeviceUser()
         QMessageBox::information(m_wnd, tr("tips"), tr("no device"));
         return nullptr;
     }
-    else if (1 == devCount)
-    {
-        HGChar errInfo[256];
-        HGSaneDevice dev = nullptr;
-        HGSane_OpenDevice(source, 0, &dev, errInfo, 256);
-        if (nullptr == dev)
-        {
-            HGSane_CloseSource(source);
-            QMessageBox::information(m_wnd, tr("tips"), QString::fromUtf8(errInfo));
-            return nullptr;
-        }
+//    else if (1 == devCount)
+//    {
+//        HGChar errInfo[256];
+//        HGSaneDevice dev = nullptr;
+//        HGSane_OpenDevice(source, 0, &dev, errInfo, 256);
+//        if (nullptr == dev)
+//        {
+//            HGSane_CloseSource(source);
+//            QMessageBox::information(m_wnd, tr("tips"), QString::fromUtf8(errInfo));
+//            return nullptr;
+//        }
 
-        return new DeviceUser(m_wnd, source, dev, m_password);
-    }
+//        return new DeviceUser(m_wnd, source, dev, m_password);
+//    }
 
     HGSaneDevice dev = nullptr;
     HGSane_OpenSelectedDevice(source, m_wnd, &dev);
diff --git a/modules/saneui/dialog_device_scan.cpp b/modules/saneui/dialog_device_scan.cpp
index 79a338c3..0cebd343 100644
--- a/modules/saneui/dialog_device_scan.cpp
+++ b/modules/saneui/dialog_device_scan.cpp
@@ -225,10 +225,15 @@ void HGAPI Dialog_Device_Scan::ThreadFunc(HGThread thread, HGPointer param)
         }
 
         SANE_Status stat3 = p->m_saneAPI.sane_start_api(p->m_saneDev);
-        if (SANE_STATUS_GOOD != stat3)
+        if (SANE_STATUS_NO_DOCS == stat3)
         {
             emit p->eventFunc(0, tr("Scan complete"));
             break;
         }
+        else if (SANE_STATUS_GOOD != stat3)
+        {
+            emit p->eventFunc(-1, QString::fromUtf8(p->m_saneAPI.sane_strstatus_api(stat3)));
+            break;
+        }
     }
 }