depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

image-device: Handle retry error propagation correctly

Browse source 
With the early reporting mechanism the retry error propagation needs to
be adjusted. Do the appropriate changes.
This commit is contained in:
Benjamin Berg 2020-01-13 17:24:19 +01:00
parent db14995c31
commit 54286c7603
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libfprint/fpi-image-device.c
View file

@ -414,6 +414,22 @@ fpi_image_device_retry_scan (FpImageDevice *self, FpDeviceRetry retry)
priv->enroll_await_on_pending = TRUE; priv->enroll_await_on_pending = TRUE;
fp_image_device_change_state (self, FPI_IMAGE_DEVICE_STATE_AWAIT_FINGER_OFF); fp_image_device_change_state (self, FPI_IMAGE_DEVICE_STATE_AWAIT_FINGER_OFF);
} }
else if (action == FPI_DEVICE_ACTION_VERIFY)
{
fpi_device_verify_report (FP_DEVICE (self), FPI_MATCH_ERROR, NULL, error);
priv->cancelling = TRUE;
fpi_image_device_deactivate (self);
priv->cancelling = FALSE;
fpi_device_verify_complete (FP_DEVICE (self), NULL);
}
else if (action == FPI_DEVICE_ACTION_IDENTIFY)
{
fpi_device_identify_report (FP_DEVICE (self), NULL, NULL, error);
priv->cancelling = TRUE;
fpi_image_device_deactivate (self);
priv->cancelling = FALSE;
fpi_device_identify_complete (FP_DEVICE (self), NULL);
}
else else
{ {
/* We abort the operation and let the surrounding code retry in the /* We abort the operation and let the surrounding code retry in the