|
 |
73b847 |
From 9dcb941fc0d9d4f81aa588a46e1256fb1b4e9a44 Mon Sep 17 00:00:00 2001
|
|
|
73b847 |
From: Benjamin Berg <bberg@redhat.com>
|
|
|
73b847 |
Date: Mon, 13 Jan 2020 17:56:53 +0100
|
|
|
73b847 |
Subject: [PATCH 175/181] image-device: Set cancelling when errors are reported
|
|
|
73b847 |
|
|
|
73b847 |
Allow the AWAIT_FINGER_ON to deactivation state transition after errors
|
|
|
73b847 |
are reported.
|
|
|
73b847 |
---
|
|
|
73b847 |
libfprint/fpi-image-device.c | 4 ++++
|
|
|
73b847 |
1 file changed, 4 insertions(+)
|
|
|
73b847 |
|
|
|
73b847 |
diff --git a/libfprint/fpi-image-device.c b/libfprint/fpi-image-device.c
|
|
|
73b847 |
index f962b8a..888c931 100644
|
|
|
73b847 |
--- a/libfprint/fpi-image-device.c
|
|
|
73b847 |
+++ b/libfprint/fpi-image-device.c
|
|
|
73b847 |
@@ -415,7 +415,9 @@ fpi_image_device_retry_scan (FpImageDevice *self, FpDeviceRetry retry)
|
|
|
73b847 |
/* We abort the operation and let the surrounding code retry in the
|
|
|
73b847 |
* non-enroll case (this is identical to a session error). */
|
|
|
73b847 |
g_debug ("Abort current operation due to retry (non-enroll case)");
|
|
|
73b847 |
+ priv->cancelling = TRUE;
|
|
|
73b847 |
fpi_image_device_deactivate (self);
|
|
|
73b847 |
+ priv->cancelling = FALSE;
|
|
|
73b847 |
fpi_device_action_error (FP_DEVICE (self), error);
|
|
|
73b847 |
}
|
|
|
73b847 |
}
|
|
|
73b847 |
@@ -463,7 +465,9 @@ fpi_image_device_session_error (FpImageDevice *self, GError *error)
|
|
|
73b847 |
if (error->domain == FP_DEVICE_RETRY)
|
|
|
73b847 |
g_warning ("Driver should report retries using fpi_image_device_retry_scan!");
|
|
|
73b847 |
|
|
|
73b847 |
+ priv->cancelling = TRUE;
|
|
|
73b847 |
fpi_image_device_deactivate (self);
|
|
|
73b847 |
+ priv->cancelling = FALSE;
|
|
|
73b847 |
fpi_device_action_error (FP_DEVICE (self), error);
|
|
|
73b847 |
}
|
|
|
73b847 |
|
|
|
73b847 |
--
|
|
|
73b847 |
2.24.1
|
|
|
73b847 |
|