summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Duerr <contact@christianduerr.com>2020-02-23 01:55:29 +0000
committerGitHub <noreply@github.com>2020-02-23 01:55:29 +0000
commitfa11b56cf64dab52a2c7f3facc09d9b3a619bd81 (patch)
tree208af495af828a55c50d9cdd30e1f47fc563f00b
parent73641d03673638e361b0254ce400c02b1b65e6ed (diff)
downloadalacritty-fa11b56cf64dab52a2c7f3facc09d9b3a619bd81.tar.gz
alacritty-fa11b56cf64dab52a2c7f3facc09d9b3a619bd81.zip
Fix config reload updating incorrect grid
-rw-r--r--CHANGELOG.md1
-rw-r--r--alacritty_terminal/src/term/mod.rs7
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fabcf11c..14d21186 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Parser stopping at unknown DEC private modes/SGR character attributes
- Block selection appending duplicate newlines when last column is selected
- Bitmap fonts being a bit smaller than they should be in some cases
+- Config reload creating alternate screen history instead of updating scrollback
### Removed
diff --git a/alacritty_terminal/src/term/mod.rs b/alacritty_terminal/src/term/mod.rs
index b2184ad9..a91f41ef 100644
--- a/alacritty_terminal/src/term/mod.rs
+++ b/alacritty_terminal/src/term/mod.rs
@@ -972,7 +972,12 @@ impl<T> Term<T> {
}
self.default_cursor_style = config.cursor.style;
self.dynamic_title = config.dynamic_title();
- self.grid.update_history(config.scrolling.history() as usize);
+
+ if self.alt {
+ self.alt_grid.update_history(config.scrolling.history() as usize);
+ } else {
+ self.grid.update_history(config.scrolling.history() as usize);
+ }
}
/// Convert the active selection to a String.