lmh188
/
code_twain
mirror of http://192.168.10.5:8099/sane/code_twain.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

调整线程启动扫描失败后的信息显示方式

This commit is contained in:
gb 2023-05-29 14:44:47 +08:00
parent 1c75c897be
commit 154214e426
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sane/scanner.cpp
View File

@ -1421,14 +1421,15 @@ int scanner::thread_start(void)
{
// 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
#ifdef START_SCAN_IN_THREAD
if (callback::show_progress_ui && is_bIndicator)
{
int ev = SANE_EVENT_WORKING;
ui_notify(SANE_EVENT_SCAN_FINISHED, (void *)hg_scanner_err_description(ret), ret);
}
else
#endif
{
if (callback::close_ui)
callback::close_ui(UI_INDICATOR);
@ -1447,9 +1448,9 @@ int scanner::thread_start(void)
callback::bring_message_box_topmost(local_trans::lang_trans_between_hz936(CONST_STRING_START_FAILED).c_str());
MessageBoxW(app_wnd_, msg.c_str(), local_trans::lang_trans_between_hz936(CONST_STRING_START_FAILED).c_str(), MB_OK | MB_ICONERROR);
}
}
is_scanning_ = false;
}
}
prev_start_result_ = ret;
return ret;