mirror of
https://github.com/alacritty/alacritty.git
synced 2024-11-18 13:55:23 -05:00
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.
This commit is contained in:
parent
c541155167
commit
8570ee004b
2 changed files with 13 additions and 10 deletions
|
@ -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
|
||||
|
||||
|
|
22
src/main.rs
22
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))
|
||||
});
|
||||
.or_else(|| Config::write_defaults().ok());
|
||||
|
||||
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),
|
||||
}
|
||||
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
|
||||
|
|
Loading…
Reference in a new issue