diff options
Diffstat (limited to 'src/Xmobar/Plugins/Monitors')
| -rw-r--r-- | src/Xmobar/Plugins/Monitors/Batt.hs | 9 | ||||
| -rw-r--r-- | src/Xmobar/Plugins/Monitors/Mpris.hs | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/Xmobar/Plugins/Monitors/Batt.hs b/src/Xmobar/Plugins/Monitors/Batt.hs index bebbf1c..9ce0dca 100644 --- a/src/Xmobar/Plugins/Monitors/Batt.hs +++ b/src/Xmobar/Plugins/Monitors/Batt.hs @@ -16,7 +16,7 @@ module Xmobar.Plugins.Monitors.Batt ( battConfig, runBatt, runBatt' ) where import System.Process (system) -import Control.Monad (void) +import Control.Monad (void, when) import Control.Exception (SomeException, handle) import Xmobar.Plugins.Monitors.Common import System.FilePath ((</>)) @@ -184,10 +184,9 @@ mostCommonDef x xs = head $ last $ [x] : sortOn length (group xs) maybeAlert :: BattOpts -> Float -> IO () maybeAlert opts left = case onLowAction opts of - Nothing -> do return () - Just x -> if not (isNaN left) && actionThreshold opts >= (100 * left) - then void $ system x - else return () + Nothing -> return () + Just x -> when (not (isNaN left) && actionThreshold opts >= (100 * left)) + $ void $ system x readBatteries :: BattOpts -> [Files] -> IO Result readBatteries opts bfs = diff --git a/src/Xmobar/Plugins/Monitors/Mpris.hs b/src/Xmobar/Plugins/Monitors/Mpris.hs index 3556649..480698c 100644 --- a/src/Xmobar/Plugins/Monitors/Mpris.hs +++ b/src/Xmobar/Plugins/Monitors/Mpris.hs @@ -85,7 +85,7 @@ dbusClient = unsafePerformIO DC.connectSession runMPRIS :: (MprisVersion a) => a -> String -> [String] -> Monitor String runMPRIS version playerName _ = do metadata <- io $ getMetadata version dbusClient playerName - if [] == metadata then + if null metadata then getConfigValue naString else mapM showWithPadding (makeList version metadata) >>= parseTemplate |