From: Sven Eden <yamakuzure@gmx.net>
Date: Tue, 4 Apr 2017 06:51:33 +0000 (+0200)
Subject: Fix assertion failure when resuming from sleep/suspend
X-Git-Tag: v227.2^2~7
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=39d8e47296d2465666c42bd163155881128a8fa8

Fix assertion failure when resuming from sleep/suspend
---

diff --git a/src/login/logind-action.h b/src/login/logind-action.h
index 99b06bff8..6b63b92d3 100644
--- a/src/login/logind-action.h
+++ b/src/login/logind-action.h
@@ -22,7 +22,7 @@
 ***/
 
 typedef enum HandleAction {
-        HANDLE_IGNORE,
+        HANDLE_IGNORE = 0,
         HANDLE_POWEROFF,
         HANDLE_REBOOT,
         HANDLE_HALT,
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index d238d6c6f..0c1f90dea 100644
--- 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);
 
-        if (manager->action_what == 0 && manager->pending_action == 0)
+        if ( (0 == manager->action_what) || (HANDLE_IGNORE == manager->pending_action) )
                 return 0;
 
         if (manager_is_inhibited(manager, manager->action_what, INHIBIT_DELAY, NULL, false, false, 0, &offending)) {