From: Sven Eden <yamakuzure@gmx.net>
Date: Tue, 27 Jun 2017 06:05:27 +0000 (+0200)
Subject: Prep v231.2: Send processes the wakeup signal, even if suspending the system failed.
X-Git-Tag: v231.3~13
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=23c9553e70641ba69d1c388d3d2cc48e4c4eed6f;p=elogind.git

Prep v231.2: Send processes the wakeup signal, even if suspending the system failed.
---

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 */