pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: update to output error when using --layout (#1413)

Browse source
This commit is contained in:
Jae-Heon Ji 2022-05-12 22:42:31 +09:00 • committed by GitHub
parent f04e5bd873
commit 8c38b39ef6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
zellij-utils/src/input/layout.rs
View file

@ -260,8 +260,14 @@ impl LayoutFromYamlIntermediate {
layout_dir: Option<&PathBuf>, layout_dir: Option<&PathBuf>,
) -> LayoutFromYamlIntermediateResult { ) -> LayoutFromYamlIntermediateResult {
match layout_dir { match layout_dir {
Some(dir) => Self::from_path(&dir.join(layout)) Some(dir) => {
.or_else(|_| LayoutFromYamlIntermediate::from_default_assets(layout)), let layout_path = &dir.join(layout);
if layout_path.exists() {
Self::from_path(layout_path)
} else {
LayoutFromYamlIntermediate::from_default_assets(layout)
}
}
None => LayoutFromYamlIntermediate::from_default_assets(layout), None => LayoutFromYamlIntermediate::from_default_assets(layout),
} }
} }