Prevent panic in Xorg.active

muesli · muesli · commit e8572a654cbe · 2021-02-05T07:48:43.000+01:00
If the returned value can't be decoded, return x.root. Fixes #6.
diff --git a/desktop_unix.go b/desktop_unix.go
@@ -167,7 +167,7 @@ func (x Xorg) property(w xproto.Window, a *xproto.InternAtomReply) (*xproto.GetP
 
 func (x Xorg) active() xproto.Window {
 	p, err := x.property(x.root, x.activeAtom)
-	if err != nil {
+	if err != nil || len(p.Value) == 0 {
 		return x.root
 	}
 	return xproto.Window(xgb.Get32(p.Value))

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ func (x Xorg) property(w xproto.Window, a xproto.InternAtomReply) (xproto.GetP`
`167`	`167`
`168`	`168`	`func (x Xorg) active() xproto.Window {`
`169`	`169`	`p, err := x.property(x.root, x.activeAtom)`
`170`		`- if err != nil {`
	`170`	`+ if err != nil \|\| len(p.Value) == 0 {`
`171`	`171`	`return x.root`
`172`	`172`	`}`
`173`	`173`	`return xproto.Window(xgb.Get32(p.Value))`