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

EndXfer中恢复正常结束；设置界面是否显示由APP决定

This commit is contained in:
gb 2023-05-29 17:58:12 +08:00
parent f23a7689c6
commit b7ccb16e0f
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
twain/twain/huagaods.cpp
View File

@ -1042,7 +1042,14 @@ Result huagao_ds::pendingXfersGet(const Identity&, PendingXfers& data)
// 显示设置界面时，不能阻塞在EndXfer，否则最后一张图片传输后显示不出来，故在此做阻塞调用
// int cnt = get_scanned_image_count(-1);
int cnt = show_setting_ ? 1 : get_scanned_image_count(-1);
// FIX-2023-05-29: 是否保持设置界面显示，由APP决定，此处不再由是否显示UI来决定，保持一个扫描流程正常结束
int cnt = /*show_setting_ ? 1 :*/ get_scanned_image_count(10);
while (cnt == 0)
{
if (scanner_status_ == SCANNER_STATUS_STOPPED)
break;
cnt = get_scanned_image_count(10);
}
data.setCount(cnt);
return success();

2
twain/twain/huagaods.hpp
View File

@ -50,7 +50,7 @@ class huagao_ds : public Twpp::SourceFromThis<huagao_ds> {
Twpp::Compression m_compression = Twpp::Compression::None;
SANE_Parameters* cur_head_;
int dpi_;
int scanner_status_;
volatile int scanner_status_;
bool xfer_ready_failed_;
bool log_all_triple_;
bool app_trigger_event_;