null safety so that it might load properly idk

This commit is contained in:
2026-08-08 19:59:10 +01:00
parent b3c46e2df2
commit 021ddae2d0
2 changed files with 25 additions and 10 deletions

View File

@@ -8,9 +8,11 @@ import "../Color.js" as Colors
Singleton {
id: root
property double batteryPercentage: root.mainBattery.percentage
property bool batteryPresent: root.mainBattery.ready
property UPowerDevice mainBattery: UPower.displayDevice
property double batteryPercentage: root.mainBattery.percentage || 0
property bool batteryPresent: root.mainBattery.ready || false
property UPowerDevice mainBattery: UPower.displayDevice || undefined
function getBatteryColor() {
let criticalLevel = 20;

View File

@@ -6,11 +6,14 @@ import Quickshell.Bluetooth
Singleton {
id: root
property BluetoothAdapter defaultAdapter: Bluetooth.defaultAdapter
property string defaultAdapterName: Bluetooth.defaultAdapter.adapterId
property BluetoothAdapter defaultAdapter: Bluetooth.defaultAdapter || null
property string defaultAdapterName: defaultAdapter ? defaultAdapter.adapterId : ""
function getConnected() {
let deviceList = getDevicesList();
if (deviceList.length == 0) {
return false;
} else {
for (let device in deviceList) {
let currentDevice = deviceList[device];
if (currentDevice.connected == true) {
@@ -19,9 +22,13 @@ Singleton {
}
return false;
}
}
function getConnectedDevicesList() {
let devicesList = getDevicesList();
if (!devicesList) {
return [];
}
let connectedList = [];
for (let device of devicesList) {
if (device.connected == true) {
@@ -32,6 +39,9 @@ Singleton {
}
function getDeviceText(device) {
if (!device) {
return undefined;
}
let deviceName = device.deviceName;
let deviceIcon = getIcon(device.icon);
let deviceMac = device.address;
@@ -54,6 +64,9 @@ Singleton {
}
function getDevicesList() {
if (!root.defaultAdapter) {
return [];
}
return root.defaultAdapter.devices.values;
}