alacritty

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README

commit 8570ee004be5fb9d82e7d496662215c9b75c6334
parent c54115516717d6fd429065158d81a93c0818fefa
Author: Christian Duerr <chrisduerr@users.noreply.github.com>
Date:   Wed,  9 Jan 2019 20:27:13 +0000

Fix crash when starting Alacritty on full drives

Since the Alacritty configuration file is written to the filesystem at
startup, this could create issues when the system does not have any free
space left.

To circumvent this problem, the default configuration is now returned
even when the configuration file could not be created. Instead of
crashing Alacritty, an error is now emitted.

Fixes #1936.

Diffstat:
MCHANGELOG.md | 1+
Msrc/main.rs | 26++++++++++++++------------
2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Replaced `Command` with `Super` in the Linux and Windows config documentation - Prevent semantic and line selection from starting with the right or middle mouse button +- Prevent Alacritty from crashing when started on a system without any free space ## Version 0.2.5 diff --git a/src/main.rs b/src/main.rs @@ -92,19 +92,21 @@ fn main() { fn load_config(options: &cli::Options) -> Config { let config_path = options.config_path() .or_else(Config::installed_config) - .unwrap_or_else(|| { - Config::write_defaults() - .unwrap_or_else(|err| die!("Write defaults config failure: {}", err)) - }); - - Config::load_from(&*config_path).unwrap_or_else(|err| { - match err { - ConfigError::Empty => info!("Config file {:?} is empty; loading default", config_path), - _ => error!("Error: {}; loading default config", err), - } - + .or_else(|| Config::write_defaults().ok()); + + if let Some(config_path) = config_path { + Config::load_from(&*config_path).unwrap_or_else(|err| { + match err { + ConfigError::Empty => info!("Config file {:?} is empty; loading default", config_path), + _ => error!("Unable to load default config: {}", err), + } + + Config::default() + }) + } else { + error!("Unable to write the default config"); Config::default() - }) + } } /// Run Alacritty