blacklight/aerc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

grid: protect calls to cell.Content

Browse source 
Many panics occur from calling Draw on a nil widget, stemming from the
grid ui element. Protect the calls to Draw from within grid to prevent
this method of panic.

Signed-off-by: Tim Culverhouse <tim@timculverhouse.com>
Acked-by: Robin Jarry <robin@jarry.cc>
This commit is contained in:
Tim Culverhouse 2022-09-19 19:20:32 -05:00 committed by Robin Jarry
parent a31606db0d
commit a91009edf7
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ui/grid.go
View file

@ -134,9 +134,11 @@ func (grid *Grid) Draw(ctx *Context) {
continue continue
} }
subctx := ctx.Subcontext(x, y, width, height) subctx := ctx.Subcontext(x, y, width, height)
if cell.Content != nil {
cell.Content.Draw(subctx) cell.Content.Draw(subctx)
} }
} }
}
func (grid *Grid) MouseEvent(localX int, localY int, event tcell.Event) { func (grid *Grid) MouseEvent(localX int, localY int, event tcell.Event) {
if event, ok := event.(*tcell.EventMouse); ok { if event, ok := event.(*tcell.EventMouse); ok {
@ -230,8 +232,10 @@ func (grid *Grid) Invalidate() {
grid.invalidateLayout() grid.invalidateLayout()
grid.mutex.RLock() grid.mutex.RLock()
for _, cell := range grid.cells { for _, cell := range grid.cells {
if cell.Content != nil {
cell.Content.Invalidate() cell.Content.Invalidate()
} }
}
grid.mutex.RUnlock() grid.mutex.RUnlock()
} }