From 846a62e631f45ff5d971d9e60d64f9f46f0c60c6 Mon Sep 17 00:00:00 2001 From: Henrik Friedrichsen Date: Mon, 26 Apr 2021 22:01:02 +0200 Subject: [PATCH] Log warning instead of panicking on invalid color fixes #498 --- src/theme.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/theme.rs b/src/theme.rs index 3516f4d..8dd8577 100644 --- a/src/theme.rs +++ b/src/theme.rs @@ -10,8 +10,14 @@ macro_rules! load_color { $theme .as_ref() .and_then(|t| t.$member.clone()) - .map(|c| Color::parse(c.as_ref()).expect(&format!("Failed to parse color \"{}\"", c))) - .unwrap_or($default) + .and_then(|c| Color::parse(c.as_ref())) + .unwrap_or_else(|| { + warn!( + "Failed to parse color in \"{}\", falling back to default", + stringify!($member) + ); + $default + }) }; }