From cd9c3327cbc936fc7e3a07d12b94328586ccfbaa Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 26 Sep 2024 09:45:44 +0200 Subject: [PATCH] logind-dbus: really cancel scheduled shutdown Fixes #34554 --- src/login/logind-dbus.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index b66573f0963..6dd375c1646 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -2379,9 +2379,9 @@ static usec_t nologin_timeout_usec(usec_t elapse) { static void reset_scheduled_shutdown(Manager *m) { assert(m); - m->scheduled_shutdown_timeout_source = sd_event_source_unref(m->scheduled_shutdown_timeout_source); - m->wall_message_timeout_source = sd_event_source_unref(m->wall_message_timeout_source); - m->nologin_timeout_source = sd_event_source_unref(m->nologin_timeout_source); + m->scheduled_shutdown_timeout_source = sd_event_source_disable_unref(m->scheduled_shutdown_timeout_source); + m->wall_message_timeout_source = sd_event_source_disable_unref(m->wall_message_timeout_source); + m->nologin_timeout_source = sd_event_source_disable_unref(m->nologin_timeout_source); m->scheduled_shutdown_action = _HANDLE_ACTION_INVALID; m->scheduled_shutdown_timeout = USEC_INFINITY; -- 2.47.3