Blame 0020-logind-Stopped-inhibitions-should-be-considered-inac.patch
|
 |
2d8d482 |
From 1bcc1b6eba1505f816c91db504098b5b8509311e Mon Sep 17 00:00:00 2001
|
|
|
2d8d482 |
From: afrantzis <alexandros.frantzis@canonical.com>
|
|
|
2d8d482 |
Date: Wed, 5 Apr 2017 11:32:55 +0300
|
|
|
2d8d482 |
Subject: [PATCH] logind: Stopped inhibitions should be considered inactive
|
|
|
2d8d482 |
(#5698)
|
|
|
2d8d482 |
|
|
|
2d8d482 |
(cherry picked from commit 5e8273acac6af57d8c9cdec57388bab451a4cbc0)
|
|
|
2d8d482 |
---
|
|
|
2d8d482 |
src/login/logind-inhibit.c | 5 ++++-
|
|
|
2d8d482 |
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
2d8d482 |
|
|
|
2d8d482 |
diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c
|
|
|
2d8d482 |
index 5ca42b1ca2..1e6f383738 100644
|
|
|
2d8d482 |
--- a/src/login/logind-inhibit.c
|
|
|
2d8d482 |
+++ b/src/login/logind-inhibit.c
|
|
|
2d8d482 |
@@ -347,7 +347,7 @@ InhibitWhat manager_inhibit_what(Manager *m, InhibitMode mm) {
|
|
|
2d8d482 |
assert(m);
|
|
|
2d8d482 |
|
|
|
2d8d482 |
HASHMAP_FOREACH(i, m->inhibitors, j)
|
|
|
2d8d482 |
- if (i->mode == mm)
|
|
|
2d8d482 |
+ if (i->mode == mm && i->started)
|
|
|
2d8d482 |
what |= i->what;
|
|
|
2d8d482 |
|
|
|
2d8d482 |
return what;
|
|
|
2d8d482 |
@@ -388,6 +388,9 @@ bool manager_is_inhibited(
|
|
|
2d8d482 |
assert(w > 0 && w < _INHIBIT_WHAT_MAX);
|
|
|
2d8d482 |
|
|
|
2d8d482 |
HASHMAP_FOREACH(i, m->inhibitors, j) {
|
|
|
2d8d482 |
+ if (!i->started)
|
|
|
2d8d482 |
+ continue;
|
|
|
2d8d482 |
+
|
|
|
2d8d482 |
if (!(i->what & w))
|
|
|
2d8d482 |
continue;
|
|
|
2d8d482 |
|