From bed2e83fd6060b0204c29fbe6b03f7ba3fde2c8e Mon Sep 17 00:00:00 2001
From: gb <741021719@qq.com>
Date: Tue, 30 May 2023 10:12:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=BD=E7=95=A5=E9=94=99=E8=AF=AF=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E9=94=99=E8=AF=AF=E4=BB=A3=E7=A0=81=E5=9C=A8?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=89=AB=E6=8F=8F=E4=BA=8B=E4=BB=B6=E4=B8=AD?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sane/scanner.cpp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/sane/scanner.cpp b/sane/scanner.cpp
index a0fed16..b9947e9 100644
--- a/sane/scanner.cpp
+++ b/sane/scanner.cpp
@@ -3374,21 +3374,21 @@ int scanner::handle_device_event(int ev_code, void* data, unsigned int* len)
 			log_info(msg, 1);
 		}
 	}
-	else if (ev_code == SANE_EVENT_ERROR)
-	{
-		if (callback::show_messagebox_ui && *len)
-		{
-			callback::show_messagebox_ui(app_wnd_, ev_code, (void*)data, 0);
-		}
-		else if (*len)  //错误弹出
-		{
-			std::wstring msg(local_trans::a2u((char*)data, CP_UTF8));
-			if (!IsWindow(app_wnd_))
-				callback::bring_message_box_topmost(local_trans::lang_trans_between_hz936(CONST_STRING_ERROR).c_str());
-			MessageBoxW(app_wnd_, msg.c_str(), local_trans::lang_trans_between_hz936(CONST_STRING_ERROR).c_str(), MB_OK);
-		}
-	//	on_ui_event(ev_code, (void*)ev_code);
-	}
+	//else if (ev_code == SANE_EVENT_ERROR)			// 屏蔽，在停止扫描时展示信息 - 2023-05-30
+	//{
+	//	if (callback::show_messagebox_ui && *len)
+	//	{
+	//		callback::show_messagebox_ui(app_wnd_, ev_code, (void*)data, 0);
+	//	}
+	//	else if (*len)  //错误弹出
+	//	{
+	//		std::wstring msg(local_trans::a2u((char*)data, CP_UTF8));
+	//		if (!IsWindow(app_wnd_))
+	//			callback::bring_message_box_topmost(local_trans::lang_trans_between_hz936(CONST_STRING_ERROR).c_str());
+	//		MessageBoxW(app_wnd_, msg.c_str(), local_trans::lang_trans_between_hz936(CONST_STRING_ERROR).c_str(), MB_OK);
+	//	}
+	////	on_ui_event(ev_code, (void*)ev_code);
+	//}
 
 	return 0;
 }