From c50207a47e1d6a42d2d71bc5ca0468162673036b Mon Sep 17 00:00:00 2001 From: Jose Antonio Ortega Ruiz Date: Wed, 22 Dec 2010 00:39:18 +0100 Subject: Bug fix: infinite loop in MultiCpu I've been mistakenly blaming Top of an infinite loop after awake; as it comes, the culprit was MultiCpu, because of a recent change whereby, on the absence of cpu lines, we were generating an infinite list of empty fields. --- src/Plugins/Monitors/MultiCpu.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Plugins/Monitors/MultiCpu.hs b/src/Plugins/Monitors/MultiCpu.hs index 535196a..b8c71ca 100644 --- a/src/Plugins/Monitors/MultiCpu.hs +++ b/src/Plugins/Monitors/MultiCpu.hs @@ -50,7 +50,7 @@ percent b a = if tot > 0 then map (/ tot) $ take 4 dif else [0, 0, 0, 0] tot = foldr (+) 0 dif formatMultiCpus :: [[Float]] -> Monitor [String] -formatMultiCpus [] = return $ repeat "" +formatMultiCpus [] = return [] formatMultiCpus xs = fmap concat $ mapM formatCpu xs formatCpu :: [Float] -> Monitor [String] -- cgit v1.2.3