sane_start return the last status after a scanning loop
This commit is contained in:
parent
9bea22b28e
commit
e1f91efbe9
|
@ -3069,7 +3069,7 @@ int hg_scanner::on_scann_error(int err)
|
|||
}
|
||||
int hg_scanner::try_third_app_handle_start(bool& handled)
|
||||
{
|
||||
int ret = SCANNER_ERR_OK;
|
||||
int ret = SCANNER_ERR_OK; // status_
|
||||
|
||||
handled = !async_io_;
|
||||
if (handled)
|
||||
|
@ -3079,6 +3079,7 @@ int hg_scanner::try_third_app_handle_start(bool& handled)
|
|||
|
||||
if (!wait_img_.is_waiting() || !wait_usb_.is_waiting() || final_imgs_.size())
|
||||
{
|
||||
// working or has images ...
|
||||
while (final_imgs_.size() == 0)
|
||||
{
|
||||
if (wait_img_.is_waiting() && wait_usb_.is_waiting())
|
||||
|
@ -3092,8 +3093,10 @@ int hg_scanner::try_third_app_handle_start(bool& handled)
|
|||
|
||||
if (user_cancel_)
|
||||
handled = false;
|
||||
else
|
||||
else if (status_ == SCANNER_ERR_OK)
|
||||
ret = SCANNER_ERR_DEVICE_NO_PAPER;
|
||||
else
|
||||
ret = status_;
|
||||
}
|
||||
}
|
||||
else if (final_img_index_)
|
||||
|
@ -3102,8 +3105,10 @@ int hg_scanner::try_third_app_handle_start(bool& handled)
|
|||
|
||||
if (user_cancel_)
|
||||
handled = false;
|
||||
else
|
||||
else if (status_ == SCANNER_ERR_OK)
|
||||
ret = SCANNER_ERR_DEVICE_NO_PAPER;
|
||||
else
|
||||
ret = status_;
|
||||
}
|
||||
else
|
||||
handled = false;
|
||||
|
|
Loading…
Reference in New Issue