morgan/macos-stats
1
0
Fork 0
mirror of https://github.com/morgan9e/macos-stats synced 2026-04-14 00:04:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix: battery module freeze when disabling (#336)

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2021-02-05 18:59:57 +01:00
parent fd3150e1b2
commit 4dd4af1a4f
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ModuleKit/module.swift
View File

@@ -202,7 +202,7 @@ open class Module: Module_p {
self.enabled = false
self.store.pointee.set(key: "\(self.config.name)_state", value: false)
self.readers.forEach{ $0.pause() }
self.readers.forEach{ $0.stop() }
self.menuBarItem.isVisible = false
self.popup?.setIsVisible(false)
os_log(.debug, log: log, "Module disabled")

18
Modules/Battery/readers.swift
View File

@@ -209,18 +209,26 @@ public class ProcessReader: Reader<[TopProcess]> {
return
}
if self.task.isRunning && self.paused {
if !self.task.isRunning {
do {
try self.task.run()
} catch let error {
os_log(.error, log: log, "run Battery process reader %s", "\(error)")
}
} else if self.paused {
self.paused = !self.task.resume()
} else {
self.task.launch()
}
}
public override func pause() {
self.paused = self.task.suspend()
if self.task.isRunning && !self.paused {
self.paused = self.task.suspend()
}
}
public override func stop() {
self.task.interrupt()
if self.task.isRunning && !self.paused {
self.paused = self.task.suspend()
}
}
}