Fix possible nil pointer

FyshOS · Oct 9, 2024 · 7652c1c · 7652c1c
1 parent 0c0006b
commit 7652c1c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git 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)