From f12b123e3d29de50984dfca1be72f092615641fe Mon Sep 17 00:00:00 2001 From: Serhiy Mytrovtsiy Date: Sun, 15 Aug 2021 13:03:28 +0200 Subject: [PATCH] fix: fixed enabling widget when toggling some option in the settings when the module is disabled --- Modules/Battery/main.swift | 2 +- Modules/Bluetooth/main.swift | 2 +- Modules/CPU/main.swift | 2 +- Modules/Disk/main.swift | 8 ++++++++ Modules/Fans/main.swift | 2 +- Modules/GPU/main.swift | 2 +- Modules/Net/main.swift | 2 +- Modules/RAM/main.swift | 2 +- Modules/Sensors/main.swift | 2 +- 9 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Modules/Battery/main.swift b/Modules/Battery/main.swift index 3bf1f96e..9fe01c14 100644 --- a/Modules/Battery/main.swift +++ b/Modules/Battery/main.swift @@ -101,7 +101,7 @@ public class Battery: Module { } private func usageCallback(_ raw: Battery_Usage?) { - guard let value = raw else { + guard let value = raw, self.enabled else { return } diff --git a/Modules/Bluetooth/main.swift b/Modules/Bluetooth/main.swift index 3d5e07e9..f952b571 100644 --- a/Modules/Bluetooth/main.swift +++ b/Modules/Bluetooth/main.swift @@ -72,7 +72,7 @@ public class Bluetooth: Module { } private func batteryCallback(_ raw: [BLEDevice]?) { - guard let value = raw else { + guard let value = raw, self.enabled else { return } diff --git a/Modules/CPU/main.swift b/Modules/CPU/main.swift index 94e2b931..3d58d777 100644 --- a/Modules/CPU/main.swift +++ b/Modules/CPU/main.swift @@ -123,7 +123,7 @@ public class CPU: Module { } private func loadCallback(_ raw: CPU_Load?) { - guard let value = raw else { + guard let value = raw, self.enabled else { return } diff --git a/Modules/Disk/main.swift b/Modules/Disk/main.swift index d1e2bf91..c9c2283b 100644 --- a/Modules/Disk/main.swift +++ b/Modules/Disk/main.swift @@ -180,6 +180,10 @@ public class Disk: Module { } private func capacityCallback(_ value: Disks) { + guard self.enabled else { + return + } + DispatchQueue.main.async(execute: { self.popupView.capacityCallback(value) }) @@ -208,6 +212,10 @@ public class Disk: Module { } private func activityCallback(_ value: Disks) { + guard self.enabled else { + return + } + DispatchQueue.main.async(execute: { self.popupView.activityCallback(value) }) diff --git a/Modules/Fans/main.swift b/Modules/Fans/main.swift index 493853e8..68b5d7b5 100644 --- a/Modules/Fans/main.swift +++ b/Modules/Fans/main.swift @@ -81,7 +81,7 @@ public class Fans: Module { } private func usageCallback(_ raw: [Fan]?) { - guard let value = raw else { + guard let value = raw, self.enabled else { return } diff --git a/Modules/GPU/main.swift b/Modules/GPU/main.swift index 8e3c56f9..b77434f7 100644 --- a/Modules/GPU/main.swift +++ b/Modules/GPU/main.swift @@ -109,7 +109,7 @@ public class GPU: Module { } private func infoCallback(_ raw: GPUs?) { - guard raw != nil && !raw!.list.isEmpty, let value = raw else { + guard raw != nil && !raw!.list.isEmpty, let value = raw, self.enabled else { return } diff --git a/Modules/Net/main.swift b/Modules/Net/main.swift index 1c406202..2ff38789 100644 --- a/Modules/Net/main.swift +++ b/Modules/Net/main.swift @@ -133,7 +133,7 @@ public class Network: Module { } private func usageCallback(_ raw: Network_Usage?) { - guard let value = raw else { + guard let value = raw, self.enabled else { return } diff --git a/Modules/RAM/main.swift b/Modules/RAM/main.swift index aec55b41..4f466d95 100644 --- a/Modules/RAM/main.swift +++ b/Modules/RAM/main.swift @@ -113,7 +113,7 @@ public class RAM: Module { } private func loadCallback(_ raw: RAM_Usage?) { - guard raw != nil, let value = raw else { + guard raw != nil, let value = raw, self.enabled else { return } diff --git a/Modules/Sensors/main.swift b/Modules/Sensors/main.swift index d734258f..0334b532 100644 --- a/Modules/Sensors/main.swift +++ b/Modules/Sensors/main.swift @@ -63,7 +63,7 @@ public class Sensors: Module { } private func usageCallback(_ raw: [Sensor_p]?) { - guard let value = raw else { + guard let value = raw, self.enabled else { return }