fdo-mirrors/upower
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/upower/upower.git synced 2026-05-05 14:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

daemon: Fix action timeout abortion

Browse source 
Aborting the critical action would not clear the ID. Which in turn meant
that we would never re-arm the timer if such an event occured.

Fixes: #172
This commit is contained in:
Benjamin Berg 2022-02-21 19:20:11 +01:00
parent 72cf3e637d
commit 4b5b8a451b
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/up-daemon.c
View file

@ -628,7 +628,7 @@ up_daemon_set_warning_level (UpDaemon *daemon, UpDeviceLevel warning_level)
} else {
if (daemon->priv->action_timeout_id > 0) {
g_debug ("Removing timeout as action level changed");
g_source_remove (daemon->priv->action_timeout_id);
g_clear_handle_id (&daemon->priv->action_timeout_id, g_source_remove);
}
if (daemon->priv->critical_action_lock_fd >= 0) {
@ -1189,8 +1189,7 @@ up_daemon_finalize (GObject *object)
UpDaemon *daemon = UP_DAEMON (object);
UpDaemonPrivate *priv = daemon->priv;
if (priv->action_timeout_id != 0)
g_source_remove (priv->action_timeout_id);
g_clear_handle_id (&priv->action_timeout_id, g_source_remove);
if (priv->critical_action_lock_fd >= 0) {
close (priv->critical_action_lock_fd);