From 3e9e1cb9d300e13109206496d825351c4f41cc1c Mon Sep 17 00:00:00 2001 From: Sibi Prabakaran Date: Sun, 10 May 2020 19:43:56 +0530 Subject: Fix crashes/busy looping happening via index Right now, with the `StdinReader` plugin enabled - you can crash/cause busy looping of xmobar if the following html file is opened: ``` hello <fn=1>string</fn> ``` More details about this bug is here: https://github.com/jaor/xmobar/issues/442#issuecomment-625706001 This MR also fixes another bug which produces a crash in xmobar if you pass non integer items between fn: --- src/Xmobar/X11/Types.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/Xmobar/X11/Types.hs') diff --git a/src/Xmobar/X11/Types.hs b/src/Xmobar/X11/Types.hs index 333dc96..b22f807 100644 --- a/src/Xmobar/X11/Types.hs +++ b/src/Xmobar/X11/Types.hs @@ -20,6 +20,7 @@ module Xmobar.X11.Types (X, XConf (..)) where import Graphics.X11.Xlib import Control.Monad.Reader import Data.Map +import qualified Data.List.NonEmpty as NE import Xmobar.X11.Bitmap import Xmobar.X11.Text @@ -33,7 +34,7 @@ data XConf = XConf { display :: Display , rect :: Rectangle , window :: Window - , fontListS :: [XFont] + , fontListS :: NE.NonEmpty XFont , verticalOffsets :: [Int] , iconS :: Map FilePath Bitmap , config :: Config -- cgit v1.2.3