zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-08-17 23:01:04 +02:00
Code Activity

fix(upower): avoid panic on client init error

Browse source
This commit is contained in:
Jake Stanger 2024-08-09 23:16:00 +01:00
parent 9d125353c4
commit 474e1fe364
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
4 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/clients/mod.rs
View file

@ -164,12 +164,17 @@ impl Clients {
}
#[cfg(feature = "upower")]
pub fn upower(&mut self) -> Arc<zbus::fdo::PropertiesProxy<'static>> {
self.upower
.get_or_insert_with(|| {
crate::await_sync(async { upower::create_display_proxy().await })
})
.clone()
pub fn upower(&mut self) -> ClientResult<zbus::fdo::PropertiesProxy<'static>> {
let client = match &self.upower {
Some(client) => client.clone(),
None => {
let client = await_sync(async { upower::create_display_proxy().await })?;
self.upower.replace(client.clone());
client
}
};
Ok(client)
}
#[cfg(feature = "volume")]