leyoda/cosmic-settings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: use loaded theme from config, instead of falling back to default theme when there is an error

Browse source
This commit is contained in:
Ashley Wulber 2025-07-11 12:13:27 -04:00 • committed by Ashley Wulber
parent d6355613c9
commit 57a26e2da8
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cosmic-settings/src/pages/desktop/appearance/theme_manager.rs
View file

@ -45,7 +45,15 @@ impl From<(Option<Config>, Option<Config>, Option<Vec<Srgba>>)> for ThemeCustomi
Option<Vec<Srgba>>, Option<Vec<Srgba>>,
), ),
) -> Self { ) -> 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()) { let mut theme_builder = match ThemeBuilder::get_entry(builder_config.as_ref().unwrap()) {
Ok(t) => t, Ok(t) => t,