Fix assertion failure when resuming from sleep/suspend

diff --git a/src/login/logind-action.h b/src/login/logind-action.h
index 99b06bff8b7a40973ec6ec29c71f7cd0e2e9f856..6b63b92d3c5e2c62432b8d938c4709f9ce62f8ee 100644 (file)
--- 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 d238d6c6f9c178761908073888045861f1894854..0c1f90dea1c83ff691205effaf5786f72616b975 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);
 
-        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)) {