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

Merge branch 'master' into feat/build-flags

Browse source 
# Conflicts:
#	src/image/provider.rs
This commit is contained in:
Jake Stanger 2023-02-01 21:07:36 +00:00
commit 2780d98ee0
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/image/provider.rs
View file

@ -85,7 +85,7 @@ impl<'a> ImageProvider<'a> {
} }
Some(input_type) => Err(Report::msg(format!("Unsupported image type: {input_type}")) Some(input_type) => Err(Report::msg(format!("Unsupported image type: {input_type}"))
.note("You may need to recompile with support if available")), .note("You may need to recompile with support if available")),
None if PathBuf::from(input_name).exists() => { None if PathBuf::from(input_name).is_file() => {
Ok(ImageLocation::Local(PathBuf::from(input_name))) Ok(ImageLocation::Local(PathBuf::from(input_name)))
} }
None => get_desktop_icon_name(input_name).map_or_else( None => get_desktop_icon_name(input_name).map_or_else(