All hardware OR all software

Author: danirabbit

src/rfkill.vala

@@ -80,18 +80,27 @@ public class RFKillManager : Object {
         return devices;
     }
 
+    /*
+    * Checks for Airplane mode
+    * Setting airplane mode from here does all software lock, whereas setting
+    * from a key press does all hardware lock. We need one of these two things—
+    * all devices to be locked somehow—to consider it Airplane Mode
+    */
     public bool get_airplane_mode () {
+        var all_hardware_locked = true;
+        var all_software_locked = true;
+
         foreach (unowned var device in get_devices ()) {
             if (!device.software_lock) {
-                return false;
+                all_software_locked = false;
             }
 
             if (!device.hardware_lock) {
-                return false;
+                all_hardware_locked = false;
             }
         }
 
-        return true;
+        return all_hardware_locked || all_software_locked;
     }
 
     public void set_software_lock (RFKillDeviceType type, bool lock_enabled) {