diff options
| author | Thomas Adam <thomas@xteddy.org> | 2019-09-25 00:01:25 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2019-09-25 00:01:25 +0100 |
| commit | d89510e1aa9d27a7afcc069dbc8001663258af78 (patch) | |
| tree | 342ba00e18947c4846fc272aae526ed36381a2ec /screen-write.c | |
| parent | 2534aa4d2d0b29013065468f75fb407c6eb603c4 (diff) | |
| parent | e3359f8349cf972052604c089b5bab71f5e33095 (diff) | |
| download | rtmux-d89510e1aa9d27a7afcc069dbc8001663258af78.tar.gz rtmux-d89510e1aa9d27a7afcc069dbc8001663258af78.tar.bz2 rtmux-d89510e1aa9d27a7afcc069dbc8001663258af78.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'screen-write.c')
| -rw-r--r-- | screen-write.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/screen-write.c b/screen-write.c index 6c509e2c..34d16ee8 100644 --- a/screen-write.c +++ b/screen-write.c @@ -1326,8 +1326,7 @@ screen_write_collect_end(struct screen_write_ctx *ctx) } } - memcpy(&gc, &ci->gc, sizeof gc); - grid_view_set_cells(s->grid, s->cx, s->cy, &gc, ci->data, ci->used); + grid_view_set_cells(s->grid, s->cx, s->cy, &ci->gc, ci->data, ci->used); screen_write_set_cursor(ctx, s->cx + ci->used, -1); for (xx = s->cx; xx < screen_size_x(s); xx++) { @@ -1351,8 +1350,7 @@ screen_write_collect_add(struct screen_write_ctx *ctx, /* * Don't need to check that the attributes and whatnot are still the * same - input_parse will end the collection when anything that isn't - * a plain character is encountered. Also nothing should make it here - * that isn't a single ASCII character. + * a plain character is encountered. */ collect = 1; |