From 368556826d090b508a25111914b214a9fb0a69ba Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Wed, 11 Mar 2015 00:52:49 +0100
Subject: Another attempt at better error handling in Volume

---
 src/Plugins/Monitors/Volume.hs | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/Plugins/Monitors/Volume.hs b/src/Plugins/Monitors/Volume.hs
index 9f33b3e..338cf64 100644
--- a/src/Plugins/Monitors/Volume.hs
+++ b/src/Plugins/Monitors/Volume.hs
@@ -1,7 +1,7 @@
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Plugins.Monitors.Volume
--- Copyright   :  (c) 2011, 2013 Thomas Tuegel
+-- Copyright   :  (c) 2011, 2013, 2015 Thomas Tuegel
 -- License     :  BSD-style (see LICENSE)
 --
 -- Maintainer  :  Jose A. Ortega Ruiz <jao@gnu.org>
@@ -122,13 +122,7 @@ formatDb opts dbi = do
 runVolume :: String -> String -> [String] -> Monitor String
 runVolume mixerName controlName argv = do
     opts <- io $ parseOpts argv
-    (lo, hi, val, db, sw) <- io $ withMixer mixerName $ \mixer -> do
-        control <- getControlByName mixer controlName
-        (lo, hi) <- liftMaybe $ getRange <$> volumeControl control
-        val <- getVal $ volumeControl control
-        db <- getDB $ volumeControl control
-        sw <- getSw $ switchControl control
-        return (lo, hi, val, db, sw)
+    (lo, hi, val, db, sw) <- io readMixer
     p <- liftMonitor $ liftM3 formatVol lo hi val
     b <- liftMonitor $ liftM3 formatVolBar lo hi val
     v <- liftMonitor $ liftM3 formatVolVBar lo hi val
@@ -139,6 +133,16 @@ runVolume mixerName controlName argv = do
 
   where
 
+    readMixer =
+      AE.catch (withMixer mixerName $ \mixer -> do
+                   control <- getControlByName mixer controlName
+                   (lo, hi) <- liftMaybe $ getRange <$> volumeControl control
+                   val <- getVal $ volumeControl control
+                   db <- getDB $ volumeControl control
+                   sw <- getSw $ switchControl control
+                   return (lo, hi, val, db, sw))
+                (const $ return (Nothing, Nothing, Nothing, Nothing, Nothing))
+
     volumeControl :: Maybe Control -> Maybe Volume
     volumeControl c = join $
            (playback . volume <$> c) `mplus` (common . volume <$> c)
-- 
cgit v1.2.3