From 154214e4260326b29a43b4e906f755a7a2f6df5f Mon Sep 17 00:00:00 2001
From: gb <741021719@qq.com>
Date: Mon, 29 May 2023 14:44:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BA=BF=E7=A8=8B=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E6=89=AB=E6=8F=8F=E5=A4=B1=E8=B4=A5=E5=90=8E=E7=9A=84?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sane/scanner.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/sane/scanner.cpp b/sane/scanner.cpp
index c987dd7..a8081e4 100644
--- a/sane/scanner.cpp
+++ b/sane/scanner.cpp
@@ -1421,14 +1421,15 @@ int scanner::thread_start(void)
 	{
 		// display error message on progress UI, may be closed immediately by APP, so we hide progress UI and call message_box ...
 		// 
-		//if (callback::show_progress_ui && is_bIndicator)
-		//{
-		//	int ev = SANE_EVENT_WORKING;
-		//
-		////	on_ui_event(ev, (void*)ev);
-		//	ui_notify(SANE_EVENT_SCAN_FINISHED, (void *)hg_scanner_err_description(ret), ret);
-		//}
-		//else
+#ifdef START_SCAN_IN_THREAD
+		if (callback::show_progress_ui && is_bIndicator)
+		{
+			int ev = SANE_EVENT_WORKING;
+		
+			ui_notify(SANE_EVENT_SCAN_FINISHED, (void *)hg_scanner_err_description(ret), ret);
+		}
+		else
+#endif
 		{
 			if (callback::close_ui)
 				callback::close_ui(UI_INDICATOR);
@@ -1447,8 +1448,8 @@ int scanner::thread_start(void)
 					callback::bring_message_box_topmost(local_trans::lang_trans_between_hz936(CONST_STRING_START_FAILED).c_str());
 				MessageBoxW(app_wnd_, msg.c_str(), local_trans::lang_trans_between_hz936(CONST_STRING_START_FAILED).c_str(), MB_OK | MB_ICONERROR);
 			}
+			is_scanning_ = false;
 		}
-		is_scanning_ = false;
 	}
 	prev_start_result_ = ret;