PolytreeDE/alacritty
1
0
Fork 0
mirror of https://github.com/alacritty/alacritty.git synced 2024-11-18 13:55:23 -05:00
Code Releases Activity

Fix reset CLI parameters on config reload (#3216)

Browse source 
Fix reset CLI parameters on config reload

Fixes #3197.
This commit is contained in:
Christian Duerr 2020-01-17 00:42:26 +01:00 committed by Kirill Chibisov
parent f54aabfe92
commit 3203d2b3fa
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Limited payload length in clipboard escape (used for Tmux copy/paste) - Limited payload length in clipboard escape (used for Tmux copy/paste)
- Alacritty not ignoring keyboard events for changing WM focus on X11 - Alacritty not ignoring keyboard events for changing WM focus on X11
- Regression which added a UNC path prefix to the working directory on Windows - Regression which added a UNC path prefix to the working directory on Windows
- CLI parameters discarded when config is reload
## 0.4.1 ## 0.4.1

2
alacritty/src/config/mod.rs
View file

@ -150,7 +150,7 @@ fn read_config(path: &PathBuf) -> Result<Config> {
let mut contents = fs::read_to_string(path)?; let mut contents = fs::read_to_string(path)?;
// Remove UTF-8 BOM // Remove UTF-8 BOM
if contents.chars().nth(0) == Some('\u{FEFF}') { if contents.starts_with('\u{FEFF}') {
contents = contents.split_off(3); contents = contents.split_off(3);
} }

4
alacritty/src/event.rs
View file

@ -35,6 +35,7 @@ use alacritty_terminal::term::{SizeInfo, Term};
use alacritty_terminal::tty; use alacritty_terminal::tty;
use alacritty_terminal::util::{limit, start_daemon}; use alacritty_terminal::util::{limit, start_daemon};
use crate::cli::Options;
use crate::config; use crate::config;
use crate::config::Config; use crate::config::Config;
use crate::display::Display; use crate::display::Display;
@ -482,6 +483,9 @@ impl<N: Notify + OnResize> Processor<N> {
processor.ctx.display_update_pending.message_buffer = Some(()); processor.ctx.display_update_pending.message_buffer = Some(());
if let Ok(config) = config::reload_from(&path) { if let Ok(config) = config::reload_from(&path) {
let options = Options::new();
let config = options.into_config(config);
processor.ctx.terminal.update_config(&config); processor.ctx.terminal.update_config(&config);
if processor.ctx.config.font != config.font { if processor.ctx.config.font != config.font {