From 5ac2aca6926137036b0a0f6fe1a3afd5337d838b Mon Sep 17 00:00:00 2001 From: gb <741021719@qq.com> Date: Wed, 24 May 2023 17:37:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=AF=E5=8A=A8=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E6=B6=88=E6=81=AF=E4=B8=80=E9=97=AA=E8=80=8C=E8=BF=87?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sane/scanner.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/sane/scanner.cpp b/sane/scanner.cpp index 4bf4e7c..b36aa38 100644 --- a/sane/scanner.cpp +++ b/sane/scanner.cpp @@ -2442,15 +2442,19 @@ COM_API_IMPLEMENT(scanner, int, start(void)) //} else { - 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 + // 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 { + if (callback::close_ui) + callback::close_ui(UI_INDICATOR); if (callback::show_messagebox_ui) {