systemd-sleep: (bug) honor s2h and hybrid_sleep disable settings

diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
index 32a22eebd2db1890049166095cb73f25267d50c0..4026655809ae44524ef6223fe6f4343f4b8641df 100644 (file)
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -66,10 +66,10 @@ int parse_sleep_config(SleepConfig **ret_sleep_config) {
         /* use default values unless set */
         sc->allow_suspend = allow_suspend != 0;
         sc->allow_hibernate = allow_hibernate != 0;
-        sc->allow_hybrid_sleep = allow_hybrid_sleep > 0
-                || (allow_suspend != 0 && allow_hibernate != 0);
-        sc->allow_s2h = allow_s2h > 0
-                || (allow_suspend != 0 && allow_hibernate != 0);
+        sc->allow_hybrid_sleep = allow_hybrid_sleep >= 0 ? allow_hybrid_sleep
+                : (allow_suspend != 0 && allow_hibernate != 0);
+        sc->allow_s2h = allow_s2h >= 0 ? allow_s2h
+                : (allow_suspend != 0 && allow_hibernate != 0);
 
         if (!sc->suspend_states)
                 sc->suspend_states = strv_new("mem", "standby", "freeze");