]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
logind-dbus: really cancel scheduled shutdown
authorDavid Tardon <dtardon@redhat.com>
Thu, 26 Sep 2024 07:45:44 +0000 (09:45 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 30 Sep 2024 13:13:00 +0000 (15:13 +0200)
Fixes #34554

src/login/logind-dbus.c

index b66573f096356ebc0e091987ee883f7757aae273..6dd375c1646a455bb0a4042ff8867cb0a75bc116 100644 (file)
@@ -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;