diff --git a/src/QBar/Blocks/Battery.hs b/src/QBar/Blocks/Battery.hs index cddb65a0ae6b1cd293b8513d382f206fe2ae9284..f30bc302fb6315ed3234d8a80fc880417dfd067c 100644 --- a/src/QBar/Blocks/Battery.hs +++ b/src/QBar/Blocks/Battery.hs @@ -7,7 +7,6 @@ module QBar.Blocks.Battery where import QBar.Core import QBar.Blocks.Utils import QBar.BlockOutput -import Pipes import qualified Data.Text.Lazy as T import qualified Data.Text.Lazy.IO as TIO @@ -75,7 +74,7 @@ batteryBlock = forever $ do updateBatteryBlock :: Bool -> [BatteryState] -> Block () -updateBatteryBlock _ [] = yield Nothing +updateBatteryBlock _ [] = updateBlockEmpty updateBatteryBlock isPlugged bs = updateBlock $ (shortText.~shortText') $ mkBlockOutput fullText' where fullText' :: BlockText diff --git a/src/QBar/Core.hs b/src/QBar/Core.hs index d318a7fb0d2280efbfd256bb32362b46be543f56..df61448ad973a98305233596ed23c19e779fcbe1 100644 --- a/src/QBar/Core.hs +++ b/src/QBar/Core.hs @@ -138,6 +138,10 @@ updateBlock blockOutput = liftBlock . yield $ Just (blockOutput, Nothing) updateBlock' :: MonadBlock m => BlockEventHandler -> BlockOutput -> m () updateBlock' blockEventHandler blockOutput = liftBlock . yield $ Just (blockOutput, Just blockEventHandler) +-- |Update a block by removing the current output +updateBlockEmpty :: MonadBlock m => m () +updateBlockEmpty = liftBlock . yield $ Nothing + mkBlockState :: BlockOutput -> BlockState mkBlockState blockOutput = Just (blockOutput, Nothing)