summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Koegel <eric.koegel@gmail.com>2015-06-08 15:09:03 +0300
committerEric Koegel <eric.koegel@gmail.com>2015-06-08 15:09:03 +0300
commit2f2c2417c5b4168996e71887f40e5403fd35601f (patch)
tree3dcdd8ae335cceafbc7f4e7310123309394071e4
parentd0be428b692ba5f7b21215e75ce79e7d2960af05 (diff)
downloadConsoleKit2-2f2c2417c5b4168996e71887f40e5403fd35601f.tar.gz
Fix logic of the inhibit changed event
-rw-r--r--src/ck-manager.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ck-manager.c b/src/ck-manager.c
index 66d9620..01660a2 100644
--- a/src/ck-manager.c
+++ b/src/ck-manager.c
@@ -3448,13 +3448,13 @@ on_inhibit_manager_changed_event (CkInhibitManager *manager, gint inhibit_mode,
}
/* this system action must be for a sleep or shutdown operation */
- if (priv->system_action_data->signal != PREPARE_FOR_SLEEP ||
+ if (priv->system_action_data->signal != PREPARE_FOR_SLEEP &&
priv->system_action_data->signal != PREPARE_FOR_SHUTDOWN) {
return;
}
/* the inhibit change must be for sleep or shutdown */
- if (event != CK_INHIBIT_EVENT_SUSPEND || event != CK_INHIBIT_EVENT_SHUTDOWN) {
+ if (event != CK_INHIBIT_EVENT_SUSPEND && event != CK_INHIBIT_EVENT_SHUTDOWN) {
return;
}