EndXfer中恢复正常结束;设置界面是否显示由APP决定
This commit is contained in:
parent
f23a7689c6
commit
b7ccb16e0f
|
@ -1042,7 +1042,14 @@ Result huagao_ds::pendingXfersGet(const Identity&, PendingXfers& data)
|
||||||
|
|
||||||
// 显示设置界面时,不能阻塞在EndXfer,否则最后一张图片传输后显示不出来,故在此做阻塞调用
|
// 显示设置界面时,不能阻塞在EndXfer,否则最后一张图片传输后显示不出来,故在此做阻塞调用
|
||||||
// int cnt = get_scanned_image_count(-1);
|
// 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);
|
data.setCount(cnt);
|
||||||
|
|
||||||
return success();
|
return success();
|
||||||
|
|
|
@ -50,7 +50,7 @@ class huagao_ds : public Twpp::SourceFromThis<huagao_ds> {
|
||||||
Twpp::Compression m_compression = Twpp::Compression::None;
|
Twpp::Compression m_compression = Twpp::Compression::None;
|
||||||
SANE_Parameters* cur_head_;
|
SANE_Parameters* cur_head_;
|
||||||
int dpi_;
|
int dpi_;
|
||||||
int scanner_status_;
|
volatile int scanner_status_;
|
||||||
bool xfer_ready_failed_;
|
bool xfer_ready_failed_;
|
||||||
bool log_all_triple_;
|
bool log_all_triple_;
|
||||||
bool app_trigger_event_;
|
bool app_trigger_event_;
|
||||||
|
|
Loading…
Reference in New Issue