From d1897e2f32762b84c49cdeb931bd85c0a64f05ee Mon Sep 17 00:00:00 2001
From: gb <741021719@qq.com>
Date: Tue, 14 Feb 2023 11:14:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E6=8F=8F=E8=BF=9B=E5=BA=A6=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E7=82=B9=E5=87=BB=E2=80=9C=E5=8F=96=E6=B6=88=E2=80=9D?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E9=80=9A=E7=9F=A5UI=E6=89=AB=E6=8F=8F?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F;=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=9C=A8=E7=BC=96=E8=BE=91=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88=E5=90=8D=E7=A7=B0=E6=97=B6=EF=BC=8C=E5=81=B6?=
 =?UTF-8?q?=E5=8F=91=E5=B4=A9=E6=BA=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sane/DlgCfgMgr.cpp       | 2 +-
 twain/twain/huagaods.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/sane/DlgCfgMgr.cpp b/sane/DlgCfgMgr.cpp
index cc61504..5b35962 100644
--- a/sane/DlgCfgMgr.cpp
+++ b/sane/DlgCfgMgr.cpp
@@ -107,7 +107,7 @@ void dlg_cfg_mgr::handle_notify(UINT id, LPNMHDR pnhdr)
 		{
 			LPNMLVDISPINFOW pdisp = (LPNMLVDISPINFOW)pnhdr;
 
-			label_ = pdisp->item.pszText;
+			label_ = pdisp->item.pszText ? pdisp->item.pszText : L"";
 		}
 		else if (pnhdr->code == LVN_ENDLABELEDITW)
 		{
diff --git a/twain/twain/huagaods.cpp b/twain/twain/huagaods.cpp
index 9fd8279..1346049 100644
--- a/twain/twain/huagaods.cpp
+++ b/twain/twain/huagaods.cpp
@@ -3115,6 +3115,7 @@ int huagao_ds::handle_scanner_event(int ev)
 	case SANE_EVENT_UI_CLOSE_CANCEL:
 		scanner_->stop();
 		//	notifyEndWithoutImages();
+		notifyCloseCancel();	// 修复点击进度框"取消"按钮，UI不能正常结束的BUG - added on 2023-02-14
 		break;
 	case SANE_EVENT_UI_CLOSE_NORMAL:
 		scanner_->ui_hide();