From 579a7c9d6cdb026b5ac0f026f9848b94dd670b83 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Thu, 11 May 2023 21:07:00 +0800
Subject: [PATCH] =?UTF-8?q?twain=E8=B0=83=E6=95=B4=E5=8F=AA=E8=83=BD?=
 =?UTF-8?q?=E6=89=AB=E6=8F=8F=E4=B8=80=E6=AC=A1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sane/scanner.cpp         | 5 +++++
 twain/twain/huagaods.cpp | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/sane/scanner.cpp b/sane/scanner.cpp
index 0457d00..162d7b3 100644
--- a/sane/scanner.cpp
+++ b/sane/scanner.cpp
@@ -3011,6 +3011,11 @@ COM_API_IMPLEMENT(scanner, bool, ui_show_progress(HWND parent, bool bIndicator))
 			break;
 		case UI_RESULT_CLOSE_CANCEL:
 			uev = SANE_EVENT_UI_CLOSE_CANCEL;
+			if (!is_show_ui_)
+			{
+				on_ui_event(uev, (void*)uev);
+			}
+			else
 			stop();
 			break;
 		case UI_RESULT_START_SCAN:
diff --git a/twain/twain/huagaods.cpp b/twain/twain/huagaods.cpp
index 49deed6..ceb4c97 100644
--- a/twain/twain/huagaods.cpp
+++ b/twain/twain/huagaods.cpp
@@ -995,7 +995,7 @@ Result huagao_ds::eventProcess(const Identity&, Event& event)
 		if(ev)
 			handle_scanner_event(ev);
 	}
-	// event.setMessage(Msg::Null);
+	 event.setMessage(Msg::Null);
 
 
 	return { ReturnCode::NotDsEvent, ConditionCode::Success };
@@ -1102,7 +1102,8 @@ Result huagao_ds::pendingXfersGet(const Identity&, PendingXfers& data)
 	if (!scanner_.get())
 		return seqError();
 
-	data.setCount(get_scanned_image_count(-1));
+	int cnt = get_scanned_image_count(-1);
+	data.setCount(cnt);
 	return success();
 }
 Result huagao_ds::pendingXfersEnd(const Identity& id, PendingXfers& data)