From 57a26e2da86ed38ccaeda3c35dae3acf2745aef9 Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Fri, 11 Jul 2025 12:13:27 -0400
Subject: [PATCH] fix: use loaded theme from config, instead of falling back to
 default theme when there is an error

---
 .../src/pages/desktop/appearance/theme_manager.rs      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/cosmic-settings/src/pages/desktop/appearance/theme_manager.rs b/cosmic-settings/src/pages/desktop/appearance/theme_manager.rs
index a599c05..ad8e59d 100644
--- a/cosmic-settings/src/pages/desktop/appearance/theme_manager.rs
+++ b/cosmic-settings/src/pages/desktop/appearance/theme_manager.rs
@@ -45,7 +45,15 @@ impl From<(Option<Config>, Option<Config>, Option<Vec<Srgba>>)> for ThemeCustomi
             Option<Vec<Srgba>>,
         ),
     ) -> Self {
-        let theme = Theme::get_entry(theme_config.as_ref().unwrap()).unwrap_or_default();
+        let theme = match Theme::get_entry(theme_config.as_ref().unwrap()) {
+            Ok(theme) => theme,
+            Err((errs, theme)) => {
+                for err in errs {
+                    tracing::warn!("Error while loading theme: {err:?}");
+                }
+                theme
+            }
+        };
 
         let mut theme_builder = match ThemeBuilder::get_entry(builder_config.as_ref().unwrap()) {
             Ok(t) => t,