X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind-inhibit.c;h=1e6f3837382fe163fed58bbeda901abdda364d91;hp=a7e5c01ef38a16769c5a1584a37a06cfb61c185c;hb=f3f6ae7c983865ea37e8ddfbd676586e55280f1e;hpb=648294227e8247f729d8cca927d3445ab1836f30 diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c index a7e5c01ef..1e6f38373 100644 --- a/src/login/logind-inhibit.c +++ b/src/login/logind-inhibit.c @@ -26,7 +26,7 @@ #include "escape.h" #include "fd-util.h" #include "fileio.h" -#include "formats-util.h" +#include "format-util.h" #include "logind-inhibit.h" #include "mkdir.h" #include "parse-util.h" @@ -347,7 +347,7 @@ InhibitWhat manager_inhibit_what(Manager *m, InhibitMode mm) { assert(m); HASHMAP_FOREACH(i, m->inhibitors, j) - if (i->mode == mm) + if (i->mode == mm && i->started) what |= i->what; return what; @@ -388,6 +388,9 @@ bool manager_is_inhibited( assert(w > 0 && w < _INHIBIT_WHAT_MAX); HASHMAP_FOREACH(i, m->inhibitors, j) { + if (!i->started) + continue; + if (!(i->what & w)) continue;