From 2e49040846788dbb1663d629160f90b336b8bf86 Mon Sep 17 00:00:00 2001
From: gb <741021719@qq.com>
Date: Wed, 17 May 2023 09:44:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4QT=E7=95=8C=E9=9D=A2=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=EF=BC=9B=E8=B0=83=E6=95=B4notifyApp=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=EF=BC=9A=E8=BF=9B=E5=85=A5=E6=89=AB=E6=8F=8F=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E7=8A=B6=E6=80=81=E6=94=B9=E5=8F=98=E5=9C=A8?=
 =?UTF-8?q?EndXfer=E4=BE=8B=E7=A8=8B=E4=B8=AD=E5=A4=84=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E5=86=8D=E5=9C=A8=E7=9B=B8=E5=85=B3=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=AD=E8=B0=83=E7=94=A8notifyApp=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sane/scanner.cpp         | 24 ++++++------------------
 twain/twain/huagaods.cpp | 19 ++++++++++---------
 2 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/sane/scanner.cpp b/sane/scanner.cpp
index 1553002..ccbeaac 100644
--- a/sane/scanner.cpp
+++ b/sane/scanner.cpp
@@ -3078,15 +3078,10 @@ COM_API_IMPLEMENT(scanner, bool, ui_show_setting(HWND parent, bool with_scan, bo
 
 				break;
 			case UI_RESULT_CLOSE_NORMAL:
-				is_show_ui_ = false;
-				uev = SANE_EVENT_UI_CLOSE_NORMAL;
-				on_ui_event(uev, (void*)uev);
-				break;
 			case UI_RESULT_CLOSE_CANCEL:
 				is_show_ui_ = false;
-				uev = SANE_EVENT_UI_CLOSE_CANCEL;
-				//on_ui_event(uev, (void*)uev);
-
+				uev = SANE_EVENT_UI_CLOSE_SETTING;
+				on_ui_event(uev, (void*)uev);
 				break;
 			case UI_RESULT_START_SCAN:
 				on_ui_event(SANE_EVENT_UI_SCAN_COMMAND, NULL);
@@ -3151,28 +3146,21 @@ COM_API_IMPLEMENT(scanner, bool, ui_show_progress(HWND parent, bool bIndicator))
 		int uev = SANE_EVENT_SCAN_FINISHED;
 		switch (res)
 		{
-		case UI_RESULT_FAILED:
-
-			break;
-		case UI_RESULT_OK:
-			break;
 		case UI_RESULT_CLOSE_NORMAL:
 			uev = SANE_EVENT_UI_CLOSE_NORMAL;
-			if (!is_show_ui_)
+			//if (!is_show_ui_)
 			{
 				on_ui_event(uev, (void*)uev);
 			}
 			break;
 		case UI_RESULT_CLOSE_CANCEL:
 			uev = SANE_EVENT_UI_CLOSE_CANCEL;
-			if (!is_show_ui_)
+			//if (!is_show_ui_)
 			{
 				on_ui_event(uev, (void*)uev);
 			}
-			else
-			stop();
-			break;
-		case UI_RESULT_START_SCAN:
+			//else
+			//	stop();
 			break;
 		default:
 			break;
diff --git a/twain/twain/huagaods.cpp b/twain/twain/huagaods.cpp
index 55007da..791e2ef 100644
--- a/twain/twain/huagaods.cpp
+++ b/twain/twain/huagaods.cpp
@@ -3569,17 +3569,8 @@ int huagao_ds::handle_scanner_event(int ev, bool from_event_proc)
 		//	scanner_->stop();
 		//}
 		break;
-	case SANE_EVENT_UI_CLOSE_CANCEL:
-		scanner_->stop();
-		//notifyCloseCancel();	// 修复点击进度框"取消"按钮，UI不能正常结束的BUG - added on 2023-02-14
-		//break;
-	case SANE_EVENT_UI_CLOSE_NORMAL:
 	case SANE_EVENT_UI_CLOSE_SETTING:
 		scanner_->ui_hide();
-	case SANE_EVENT_SCAN_FINISHED:
-		scanner_status_ = SCANNER_STATUS_STOPPED;
-		//notifyCloseOk();
-		//break;
 		rc = notifyCloseCancel();
 		if (!Twpp::success(rc))
 		{
@@ -3593,6 +3584,16 @@ int huagao_ds::handle_scanner_event(int ev, bool from_event_proc)
 			rc = notifyCloseCancel();
 		}
 		break;
+	case SANE_EVENT_UI_CLOSE_CANCEL:
+		scanner_->stop();
+		//notifyCloseCancel();	// 修复点击进度框"取消"按钮，UI不能正常结束的BUG - added on 2023-02-14
+		//break;
+	case SANE_EVENT_UI_CLOSE_NORMAL:
+	case SANE_EVENT_SCAN_FINISHED:
+		scanner_status_ = SCANNER_STATUS_STOPPED;	// notifyCloseCancel is not need, because it done in EndXfer
+		//notifyCloseOk();
+		//break;
+		break;
 	case SANE_EVENT_UI_SCAN_COMMAND:
 		
 			scanner_->ui_show_progress(NULL, m_bIndicator);