diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2017-04-04 08:51:33 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-04-04 08:51:33 +0200 |
| commit | 39d8e47296d2465666c42bd163155881128a8fa8 (patch) | |
| tree | 972fe6edb93e54c9924af3fa8ef60176c4f35a3d /src | |
| parent | cb29c0b51b66f934374908cd6a271786c69ca751 (diff) | |
Fix assertion failure when resuming from sleep/suspend
Diffstat (limited to 'src')
| -rw-r--r-- | src/login/logind-action.h | 2 | ||||
| -rw-r--r-- | src/login/logind-dbus.c | 2 |
2 files changed, 2 insertions, 2 deletions
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)) { |