This commit is contained in:
parent
833048a97c
commit
7de96f6dff
|
@ -1440,7 +1440,6 @@ void hg_scanner_239::thread_get_dves_image(void)
|
||||||
}
|
}
|
||||||
else if (info->From == setting3399::STOPSCAN)//鍥轰欢鐗堟湰:3B0326鑾峰彇鏃犵焊鏃讹紝涓嬮潰涓柇淇℃伅浼氬厛鍙戞棤绾稿湪鍋滄鎵弿,鐒跺悗鍦ㄥ彂鏃犵焊
|
else if (info->From == setting3399::STOPSCAN)//鍥轰欢鐗堟湰:3B0326鑾峰彇鏃犵焊鏃讹紝涓嬮潰涓柇淇℃伅浼氬厛鍙戞棤绾稿湪鍋滄鎵弿,鐒跺悗鍦ㄥ彂鏃犵焊
|
||||||
{ //姝ゆ椂int绔偣杩樿淇℃伅娌℃湁璇诲彇瀹岋紝鑰屼笖閫€鍑虹偣鍑荤户缁壂鎻忥紝涓嬮潰璁惧杩樻湭缁撴潫鎵弿
|
{ //姝ゆ椂int绔偣杩樿淇℃伅娌℃湁璇诲彇瀹岋紝鑰屼笖閫€鍑虹偣鍑荤户缁壂鎻忥紝涓嬮潰璁惧杩樻湭缁撴潫鎵弿
|
||||||
sw1.reset();
|
|
||||||
if (!svdevs_err_.empty())
|
if (!svdevs_err_.empty())
|
||||||
{
|
{
|
||||||
status_ = svdevs_err_.front();
|
status_ = svdevs_err_.front();
|
||||||
|
@ -1504,7 +1503,10 @@ void hg_scanner_239::thread_get_dves_image(void)
|
||||||
str += ":" + to_string(++auoto_paper_indx);
|
str += ":" + to_string(++auoto_paper_indx);
|
||||||
|
|
||||||
if (!user_cancel_ && is_auto_scan() && svdevs_err_.empty() && !is_quit_wait_paper_scan)
|
if (!user_cancel_ && is_auto_scan() && svdevs_err_.empty() && !is_quit_wait_paper_scan)
|
||||||
|
{
|
||||||
|
sw1.reset();
|
||||||
notify_ui_working_status(str.c_str(), SANE_EVENT_ERROR, status_);
|
notify_ui_working_status(str.c_str(), SANE_EVENT_ERROR, status_);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue