X-Git-Url: http://gitweb.michael.orlitzky.com/?p=dead%2Fhalcyon.git;a=blobdiff_plain;f=src%2FOptionalConfiguration.hs;h=600647f7fa37fafff795d9dfee1721cb0ca43d9c;hp=11add85de7ae6081755d1821cf750a0c845b4af4;hb=62b4e5715d31747ffd526c54f6697736dcbf163e;hpb=7bb00e04c15781d889f950d00babf3f183047bff

diff --git a/src/OptionalConfiguration.hs b/src/OptionalConfiguration.hs
index 11add85..600647f 100644
--- a/src/OptionalConfiguration.hs
+++ b/src/OptionalConfiguration.hs
@@ -70,7 +70,7 @@ instance Monoid OptionalCfg where
       (merge (from_address cfg1) (from_address cfg2))
       (merge (to_address cfg1) (to_address cfg2))
       (merge (verbose cfg1) (verbose cfg2))
-      (usernames cfg2) -- Use only the usernames from cfg2
+      all_usernames
     where
       merge :: (Maybe a) -> (Maybe a) -> (Maybe a)
       merge Nothing Nothing   = Nothing
@@ -78,6 +78,11 @@ instance Monoid OptionalCfg where
       merge Nothing (Just x)  = Just x
       merge (Just _) (Just y) = Just y
 
+      -- Use only the latter usernames if there are any.
+      all_usernames =
+        usernames $ if (null (usernames cfg2))
+                    then cfg1
+                    else cfg2
 
 instance DCT.Configured [String] where
   convert (DCT.List xs) =