leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: don't error when default config for toolkit settings is not present

Browse source
This commit is contained in:
Ian Douglas Scott 2025-08-22 13:41:12 -07:00 • committed by GitHub
parent 8415d77b0a
commit 2d62503fdf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/app/cosmic.rs
View file

@ -369,6 +369,12 @@ where
.into_iter() .into_iter()
.filter(cosmic_config::Error::is_err) .filter(cosmic_config::Error::is_err)
{ {
if let cosmic_config::Error::GetKey(_, err) = &why {
if err.kind() == std::io::ErrorKind::NotFound {
// No system default config installed; don't error
continue;
}
}
tracing::error!(?why, "cosmic toolkit config update error"); tracing::error!(?why, "cosmic toolkit config update error");
} }

6
src/config/mod.rs
View file

@ -25,6 +25,12 @@ pub static COSMIC_TK: LazyLock<RwLock<CosmicTk>> = LazyLock::new(|| {
.map(|c| { .map(|c| {
CosmicTk::get_entry(&c).unwrap_or_else(|(errors, mode)| { CosmicTk::get_entry(&c).unwrap_or_else(|(errors, mode)| {
for why in errors.into_iter().filter(cosmic_config::Error::is_err) { for why in errors.into_iter().filter(cosmic_config::Error::is_err) {
if let cosmic_config::Error::GetKey(_, err) = &why {
if err.kind() == std::io::ErrorKind::NotFound {
// No system default config installed; don't error
continue;
}
}
tracing::error!(?why, "CosmicTk config entry error"); tracing::error!(?why, "CosmicTk config entry error");
} }
mode mode