Blame SOURCES/0127-fpi-ssm-Clear-delayed-actions-for-parent-and-child-o.patch
|
 |
73b847 |
From f8f4344d47c7d112be87c5840c59156f0fdebbe8 Mon Sep 17 00:00:00 2001
|
|
|
73b847 |
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
|
|
|
73b847 |
Date: Thu, 12 Dec 2019 18:41:26 +0100
|
|
|
73b847 |
Subject: [PATCH 127/181] fpi-ssm: Clear delayed actions for parent and child
|
|
|
73b847 |
on subssm start
|
|
|
73b847 |
|
|
|
73b847 |
While timeout was already cleared for parent, we didn't properly delete the
|
|
|
73b847 |
cancellable.
|
|
|
73b847 |
|
|
|
73b847 |
Although we'd warn anyways when starting the SSM, is still better to clear
|
|
|
73b847 |
any delayed action also for the sub-SSM
|
|
|
73b847 |
---
|
|
|
73b847 |
libfprint/fpi-ssm.c | 5 ++++-
|
|
|
73b847 |
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
73b847 |
|
|
|
73b847 |
diff --git a/libfprint/fpi-ssm.c b/libfprint/fpi-ssm.c
|
|
|
73b847 |
index 6e56e44..3cc39a7 100644
|
|
|
73b847 |
--- a/libfprint/fpi-ssm.c
|
|
|
73b847 |
+++ b/libfprint/fpi-ssm.c
|
|
|
73b847 |
@@ -338,7 +338,10 @@ fpi_ssm_start_subsm (FpiSsm *parent, FpiSsm *child)
|
|
|
73b847 |
{
|
|
|
73b847 |
BUG_ON (parent->timeout);
|
|
|
73b847 |
child->parentsm = parent;
|
|
|
73b847 |
- g_clear_pointer (&parent->timeout, g_source_destroy);
|
|
|
73b847 |
+
|
|
|
73b847 |
+ fpi_ssm_clear_delayed_action (parent);
|
|
|
73b847 |
+ fpi_ssm_clear_delayed_action (child);
|
|
|
73b847 |
+
|
|
|
73b847 |
fpi_ssm_start (child, __subsm_complete);
|
|
|
73b847 |
}
|
|
|
73b847 |
|
|
|
73b847 |
--
|
|
|
73b847 |
2.24.1
|
|
|
73b847 |
|