From 6c3f32c5deb83c5f82bee5faf9c387a1772a5380 Mon Sep 17 00:00:00 2001
From: gb <741021719@qq.com>
Date: Fri, 3 Mar 2023 15:25:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=85=8D=E7=BD=AE=E6=96=B9?=
 =?UTF-8?q?=E6=A1=88=E5=8F=98=E6=9B=B4=E5=AD=98=E5=82=A8BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sane/DlgCfgMgr.cpp       | 3 ++-
 sane/DlgCfgMgr.h         | 2 +-
 sane/DlgSetting.cpp      | 6 +++---
 twain/twain/huagaods.cpp | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/sane/DlgCfgMgr.cpp b/sane/DlgCfgMgr.cpp
index a1b98e6..5ff5cd0 100644
--- a/sane/DlgCfgMgr.cpp
+++ b/sane/DlgCfgMgr.cpp
@@ -206,8 +206,9 @@ void dlg_cfg_mgr::on_del_selected(void)
 void dlg_cfg_mgr::on_del_all(void)
 {
 	cfg_->remove_all_schemes();
-	ListView_DeleteAllItems(get_item(IDC_LIST1));
+	ListView_DeleteAllItems(get_item(IDC_LIST1));	// clear list
 	schm_changed_ = true;
+	dlg_base::set_item_text(IDC_EDIT1, L"");
 }
 bool dlg_cfg_mgr::is_scheme_changed(void)
 {
diff --git a/sane/DlgCfgMgr.h b/sane/DlgCfgMgr.h
index 6262fce..ef66783 100644
--- a/sane/DlgCfgMgr.h
+++ b/sane/DlgCfgMgr.h
@@ -15,7 +15,7 @@ class dlg_cfg_mgr: public dlg_base
 {
 	gb::scanner_cfg*	cfg_;
 	std::wstring		label_;
-	bool				schm_changed_;
+	bool				schm_changed_;	// to notify parent refreshing UI and settings
 
 	BOOL handle_message(UINT msg, WPARAM wp, LPARAM lp) override;
 	void handle_command(WORD code, WORD id, HANDLE ctrl);
diff --git a/sane/DlgSetting.cpp b/sane/DlgSetting.cpp
index e894500..ebbae8c 100644
--- a/sane/DlgSetting.cpp
+++ b/sane/DlgSetting.cpp
@@ -130,7 +130,7 @@ void dlg_setting::handle_command(WORD code, WORD id, HANDLE ctrl)
 					}
 					n->release();
 				}
-				s->end_setting(true);
+				s->end_setting(true);	// discard changes in prev-scheme
 				s->release();
 			}
 		}
@@ -144,7 +144,7 @@ void dlg_setting::handle_command(WORD code, WORD id, HANDLE ctrl)
 				gb::sane_config_schm* s = cfg_->get_scheme();
 				if (s)
 				{
-					s->end_setting(false);
+					s->end_setting(false); 	// save changes
 					s->release();
 				}
 
@@ -196,7 +196,7 @@ void dlg_setting::handle_command(WORD code, WORD id, HANDLE ctrl)
 	{
 		dlg_cfg_mgr	dlg(cfg_, hwnd());
 		dlg.do_modal(hwnd());
-		if (dlg.is_scheme_changed())
+		if (dlg.is_scheme_changed())	// refresh settings and UI
 		{
 			gb::sane_config_schm* schm = cfg_->get_scheme();
 			apply_scheme_(schm, apply_param_);
diff --git a/twain/twain/huagaods.cpp b/twain/twain/huagaods.cpp
index d05a3df..95c41f0 100644
--- a/twain/twain/huagaods.cpp
+++ b/twain/twain/huagaods.cpp
@@ -28,7 +28,7 @@ using namespace std::placeholders;
 
 extern HMODULE me_;
 
-// WIA COM:	IStiUSD & IWiaMiniDrv
+// WIA COM:	IStiUSD & IWiaMiniDrv 
 
 //custom define caps enum
 enum CapTypeEx : unsigned short {