From 2147bf64317b84ea1686d4f12987880496dff4be Mon Sep 17 00:00:00 2001 From: Syudagye Date: Thu, 11 Apr 2024 11:32:25 +0200 Subject: [PATCH 1/2] Fixed crash at startup --- lefthk/src/config/mod.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lefthk/src/config/mod.rs b/lefthk/src/config/mod.rs index 3ae27a2..37adbef 100644 --- a/lefthk/src/config/mod.rs +++ b/lefthk/src/config/mod.rs @@ -68,11 +68,11 @@ pub fn load() -> Result { let path = BaseDirectories::with_prefix(lefthk_core::LEFTHK_DIR_NAME)?; fs::create_dir_all(path.get_config_home())?; let file_name = path.place_config_file("config.ron")?; - if Path::new(&file_name).exists() { - let contents = fs::read_to_string(file_name)?; - Config::try_from(contents)?; + if !Path::new(&file_name).exists() { + return Err(LeftError::NoConfigFound); } - Err(LeftError::NoConfigFound) + let contents = fs::read_to_string(file_name)?; + Ok(Config::try_from(contents)?) } fn propagate_exit_chord(chords: Vec<&mut Keybind>, exit_chord: &Option) { From fe01dd9cba207e3463841e3a0711ca8d1d6b6e24 Mon Sep 17 00:00:00 2001 From: mautam Date: Thu, 11 Apr 2024 13:41:49 +0000 Subject: [PATCH 2/2] chore: appease clippy --- lefthk/src/config/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lefthk/src/config/mod.rs b/lefthk/src/config/mod.rs index 37adbef..51c0b1f 100644 --- a/lefthk/src/config/mod.rs +++ b/lefthk/src/config/mod.rs @@ -72,7 +72,7 @@ pub fn load() -> Result { return Err(LeftError::NoConfigFound); } let contents = fs::read_to_string(file_name)?; - Ok(Config::try_from(contents)?) + Config::try_from(contents) } fn propagate_exit_chord(chords: Vec<&mut Keybind>, exit_chord: &Option) {