diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2017-05-17 07:56:39 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-05-17 08:00:45 +0200 |
| commit | 0c062994071d861a12181555617f83c32eb27a14 (patch) | |
| tree | a79587daac8e107c81d11665d64394c747cab525 /src/login/logind-dbus.c | |
| parent | 708583d675d19a9abbb0e2d531482f7b5f20665c (diff) | |
Reset pending actions after returning from possible suspend/sleep actions.
This should fix any "suspension loops".
Diffstat (limited to 'src/login/logind-dbus.c')
| -rw-r--r-- | src/login/logind-dbus.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 209e62b67..82ab09be1 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -1532,6 +1532,10 @@ static int execute_shutdown_or_sleep( "ss", NULL, "replace-irreversibly"); #else r = shutdown_or_sleep(m, action); + + /* no more pending actions, whether this failed or not */ + m->pending_action = HANDLE_IGNORE; + m->action_what = 0; #endif // 0 if (r < 0) return r; |