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

fpi-ssm: Clear delayed actions for parent and child on subssm start

Browse source 
While timeout was already cleared for parent, we didn't properly delete the
cancellable.

Although we'd warn anyways when starting the SSM, is still better to clear
any delayed action also for the sub-SSM
This commit is contained in:
Marco Trevisan (Treviño) 2019-12-12 18:41:26 +01:00
parent cf5473a55c
commit fe828d0bb2
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libfprint/fpi-ssm.c
View file

@ -338,7 +338,10 @@ fpi_ssm_start_subsm (FpiSsm *parent, FpiSsm *child)
{ {
BUG_ON (parent->timeout); BUG_ON (parent->timeout);
child->parentsm = parent; child->parentsm = parent;
g_clear_pointer (&parent->timeout, g_source_destroy);
fpi_ssm_clear_delayed_action (parent);
fpi_ssm_clear_delayed_action (child);
fpi_ssm_start (child, __subsm_complete); fpi_ssm_start (child, __subsm_complete);
} }