strangechoice/ironbar-fork
1
0
Fork 0
Code Pull Requests 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
parent c347b6c944 51d2c2279f
commit 2780d98ee0
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(