From 7652c1c856bd7d243d8fbfffa63a6c1308f40aae Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Wed, 9 Oct 2024 21:34:15 +0100 Subject: [PATCH] Fix possible nil pointer --- internal/x11/win/frame.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/internal/x11/win/frame.go b/internal/x11/win/frame.go index b3ea692c..c75c7a98 100644 --- a/internal/x11/win/frame.go +++ b/internal/x11/win/frame.go @@ -858,7 +858,10 @@ func (f *frame) topRightPixelWidth() uint16 { screen := fynedesk.Instance().Screens().ScreenForWindow(f.client) scale := screen.CanvasScale() - iconPix := x11.ButtonWidth(x11.XWin(f.client)) + iconPix := uint16(0) + if f.client.Properties().Icon() != nil { + iconPix = x11.ButtonWidth(x11.XWin(f.client)) + } iconAndBorderPix := iconPix + x11.BorderWidth(x11.XWin(f.client))*2 + uint16(theme.Padding()*scale) if fynedesk.Instance().Settings().BorderButtonPosition() == "Right" { iconAndBorderPix = 3*iconAndBorderPix - uint16(theme.Padding()*scale)