summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/login/logind-dbus.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 1ab874537..7313f4329 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -1627,8 +1627,6 @@ static int execute_shutdown_or_sleep(
/* no more pending actions, whether this failed or not */
m->pending_action = HANDLE_IGNORE;
- if (r < 0)
- return r;
/* As elogind can not rely on a systemd manager to call all
* sleeping processes to wake up, we have to tell them all
@@ -1638,6 +1636,9 @@ static int execute_shutdown_or_sleep(
m->action_what = 0;
} else
m->action_what = w;
+
+ if (r < 0)
+ return r;
#endif // 0
/* Make sure the lid switch is ignored for a while */