chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: rework delay inhibition logic
[elogind.git]
/
src
/
login
/
logind.c
diff --git
a/src/login/logind.c
b/src/login/logind.c
index ed0b7489b9a780a51c5a0f5e72a99907362a92c2..be793e2a93ca8a8f93cf059a220850d4e30e5f34 100644
(file)
--- a/
src/login/logind.c
+++ b/
src/login/logind.c
@@
-1628,11
+1628,11
@@
int manager_run(Manager *m) {
manager_gc(m, true);
manager_gc(m, true);
- if (m->
delayed_unit
) {
+ if (m->
action_what != 0
) {
usec_t x, y;
x = now(CLOCK_MONOTONIC);
usec_t x, y;
x = now(CLOCK_MONOTONIC);
- y = m->
delayed
_timestamp + m->inhibit_delay_max;
+ y = m->
action
_timestamp + m->inhibit_delay_max;
msec = x >= y ? 0 : (int) ((y - x) / USEC_PER_MSEC);
}
msec = x >= y ? 0 : (int) ((y - x) / USEC_PER_MSEC);
}