aboutsummaryrefslogtreecommitdiff
path: root/grid.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2017-09-11 10:01:11 +0100
committerThomas Adam <thomas@xteddy.org>2017-09-11 10:01:11 +0100
commitd8c397d1b7c4c3643c0b4bce0ea7674904a98d49 (patch)
treef55b5224d50885863ec0274057806639ff4d5641 /grid.c
parent7aa8b8a25cdc304df166e32c9013f991b38210f5 (diff)
parentd8d6c2746ee5ddece53ad5b41ac9cf9c801ac94d (diff)
downloadrtmux-d8c397d1b7c4c3643c0b4bce0ea7674904a98d49.tar.gz
rtmux-d8c397d1b7c4c3643c0b4bce0ea7674904a98d49.tar.bz2
rtmux-d8c397d1b7c4c3643c0b4bce0ea7674904a98d49.zip
Merge branch 'obsd-master'
Diffstat (limited to 'grid.c')
-rw-r--r--grid.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/grid.c b/grid.c
index c26db476..aa9aea4c 100644
--- a/grid.c
+++ b/grid.c
@@ -292,12 +292,14 @@ grid_collect_history(struct grid *gd)
{
u_int ny;
- if (gd->hsize < gd->hlimit)
+ if (gd->hsize == 0 || gd->hsize < gd->hlimit)
return;
ny = gd->hlimit / 10;
if (ny < 1)
ny = 1;
+ if (ny > gd->hsize)
+ ny = gd->hsize;
/*
* Free the lines from 0 to ny then move the remaining lines over