chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[4/5] Apply missing fixes from upstream
[elogind.git]
/
src
/
login
/
logind-dbus.c
diff --git
a/src/login/logind-dbus.c
b/src/login/logind-dbus.c
index e59795eedcaf990608e0460c89c9002683a40c3d..d238d6c6f9c178761908073888045861f1894854 100644
(file)
--- a/
src/login/logind-dbus.c
+++ b/
src/login/logind-dbus.c
@@
-1528,7
+1528,7
@@
int manager_dispatch_delayed(Manager *manager, bool timeout) {
assert(manager);
assert(manager);
- if (manager->action_what == 0)
+ if (manager->action_what == 0
&& manager->pending_action == 0
)
return 0;
if (manager_is_inhibited(manager, manager->action_what, INHIBIT_DELAY, NULL, false, false, 0, &offending)) {
return 0;
if (manager_is_inhibited(manager, manager->action_what, INHIBIT_DELAY, NULL, false, false, 0, &offending)) {