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 @@
$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\
$(SolutionDir)..\..\tmp\$(PlatformTarget)\huagao\$(Configuration)\$(ProjectName)\
$(LibraryPath)
- huagaotwain200.ds
+ huagaotwain100.ds
$(LibraryPath)
@@ -94,7 +94,7 @@
$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\
$(SolutionDir)..\..\tmp\$(PlatformTarget)\huagao\$(Configuration)\$(ProjectName)\
$(LibraryPath)
- huagaotwain400.ds
+ huagaotwain100.ds
$(LibraryPath)