From 0cadccaf0a79e3ac4f0597bd6eca301eba653b67 Mon Sep 17 00:00:00 2001
From: 13038267101 <mo1027728827@qq.com>
Date: Mon, 8 May 2023 22:29:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=89=AB=E6=8F=8F=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sane/scanner.cpp    | 14 +++++++++-----
 twain/twain.vcxproj |  4 ++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/sane/scanner.cpp b/sane/scanner.cpp
index 6c1475e..c415e17 100644
--- a/sane/scanner.cpp
+++ b/sane/scanner.cpp
@@ -2906,6 +2906,13 @@ COM_API_IMPLEMENT(scanner, bool, ui_show_setting(HWND parent, bool with_scan, bo
 	is_show_ui_ = with_scan;
 	if (callback::show_setting_ui)
 	{
+		if (with_scan)
+		{
+			events_.clear();
+			images_.clear();
+			scan_msg_ = "OK";
+			scan_err_ = false;
+		}
 		auto ui = [this](ui_result res)
 		{
 			int uev = SANE_EVENT_SCAN_FINISHED;
@@ -2925,7 +2932,7 @@ COM_API_IMPLEMENT(scanner, bool, ui_show_setting(HWND parent, bool with_scan, bo
 			case UI_RESULT_CLOSE_CANCEL:
 				is_show_ui_ = false;
 				uev = SANE_EVENT_UI_CLOSE_CANCEL;
-				on_ui_event(uev, (void*)uev);
+				//on_ui_event(uev, (void*)uev);
 
 				break;
 			case UI_RESULT_START_SCAN:
@@ -3004,10 +3011,7 @@ 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);
-			}
+			stop();
 			break;
 		case UI_RESULT_START_SCAN:
 			break;
diff --git a/twain/twain.vcxproj b/twain/twain.vcxproj
index c953bc9..f3ae8af 100644
--- a/twain/twain.vcxproj
+++ b/twain/twain.vcxproj
@@ -78,7 +78,7 @@
     <OutDir>$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\</OutDir>
     <IntDir>$(SolutionDir)..\..\tmp\$(PlatformTarget)\huagao\$(Configuration)\$(ProjectName)\</IntDir>
     <LibraryPath>$(LibraryPath)</LibraryPath>
-    <TargetName>huagaotwain200.ds</TargetName>
+    <TargetName>huagaotwain100.ds</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LibraryPath>$(LibraryPath)</LibraryPath>
@@ -94,7 +94,7 @@
     <OutDir>$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\</OutDir>
     <IntDir>$(SolutionDir)..\..\tmp\$(PlatformTarget)\huagao\$(Configuration)\$(ProjectName)\</IntDir>
     <LibraryPath>$(LibraryPath)</LibraryPath>
-    <TargetName>huagaotwain400.ds</TargetName>
+    <TargetName>huagaotwain100.ds</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LibraryPath>$(LibraryPath)</LibraryPath>