image-device: Don't deactivate if deactivation was already started
The test only prevent deactivation after it completed. Also guard against trying to deactivate a second time.
This commit is contained in:
parent
174aa2c091
commit
3ce6a15547
1 changed files with 1 additions and 1 deletions
|
@ -71,7 +71,7 @@ fpi_image_device_deactivate (FpImageDevice *self)
|
||||||
FpImageDevicePrivate *priv = fp_image_device_get_instance_private (self);
|
FpImageDevicePrivate *priv = fp_image_device_get_instance_private (self);
|
||||||
FpImageDeviceClass *cls = FP_IMAGE_DEVICE_GET_CLASS (device);
|
FpImageDeviceClass *cls = FP_IMAGE_DEVICE_GET_CLASS (device);
|
||||||
|
|
||||||
if (!priv->active)
|
if (!priv->active || priv->state == FPI_IMAGE_DEVICE_STATE_INACTIVE)
|
||||||
{
|
{
|
||||||
/* XXX: We currently deactivate both from minutiae scan result
|
/* XXX: We currently deactivate both from minutiae scan result
|
||||||
* and finger off report. */
|
* and finger off report. */
|
||||||
|
|
Loading…
Reference in a new issue