diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 22dd11190a..56dd350661 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -2054,17 +2054,17 @@ int manager_dispatch_delayed(Manager *manager, bool timeout) { if (!manager->delayed_action || manager->action_job) return 0; - if (manager_is_inhibited(manager, - manager->delayed_action->inhibit_what, - NULL, - MANAGER_IS_INHIBITED_CHECK_DELAY, - UID_INVALID, - &offending)) { - _cleanup_free_ char *comm = NULL, *u = NULL; - + if (manager_is_inhibited( + manager, + manager->delayed_action->inhibit_what, + /* since= */ NULL, + MANAGER_IS_INHIBITED_CHECK_DELAY, + UID_INVALID, + &offending)) { if (!timeout) return 0; + _cleanup_free_ char *comm = NULL, *u = NULL; (void) pidref_get_comm(&offending->pid, &comm); u = uid_to_name(offending->uid); diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c index 4614609e8a..2ef15588f2 100644 --- a/src/login/logind-inhibit.c +++ b/src/login/logind-inhibit.c @@ -421,10 +421,10 @@ bool manager_is_inhibited( if (!(i->what & w)) continue; - if ((flags & MANAGER_IS_INHIBITED_CHECK_DELAY) != (i->mode == INHIBIT_DELAY)) + if (FLAGS_SET(flags, MANAGER_IS_INHIBITED_CHECK_DELAY) != (i->mode == INHIBIT_DELAY)) continue; - if ((flags & MANAGER_IS_INHIBITED_IGNORE_INACTIVE) && + if (FLAGS_SET(flags, MANAGER_IS_INHIBITED_IGNORE_INACTIVE) && pidref_is_active_session(m, &i->pid) <= 0) continue;