LK/xmtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fixes #15, crash when battery info includes devices

Browse Source
This commit is contained in:
Sean E. Russell 2020-02-20 18:57:06 -06:00
parent a2d04d316d
commit cbad9c124e
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
widgets/battery.go
View File

@ -52,8 +52,25 @@ func (b *BatteryWidget) Scale(i int) {
func (self *BatteryWidget) update() {
batteries, err := battery.GetAll()
if err != nil {
log.Printf("failed to get battery info: %v", err)
switch errt := err.(type) {
case battery.ErrFatal:
log.Printf("fatal error fetching battery info: %v", err)
return
case battery.Errors:
batts := make([]*battery.Battery, 0)
for i, e := range errt {
if e == nil {
batts = append(batts, batteries[i])
} else {
log.Printf("recoverable error fetching battery info; skipping battery: %v", e)
}
}
if len(batts) < 1 {
log.Print("no usable batteries found")
return
}
batteries = batts
}
}
for i, battery := range batteries {
id := makeId(i)