diff options
| author | Thomas Adam <thomas@xteddy.org> | 2021-08-12 14:01:18 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2021-08-12 14:01:18 +0100 |
| commit | 9d7b1960c2bf36f678cbe213ba46221f0b80b31e (patch) | |
| tree | b59130c9b155c8a1909c3ea8b8d783eff753d0aa | |
| parent | fada3eb93238f84c5e68de4d98737d7ad59ba91e (diff) | |
| parent | 5d451551b6457d972897fa60b3dba38e13d6589f (diff) | |
| download | rtmux-9d7b1960c2bf36f678cbe213ba46221f0b80b31e.tar.gz rtmux-9d7b1960c2bf36f678cbe213ba46221f0b80b31e.tar.bz2 rtmux-9d7b1960c2bf36f678cbe213ba46221f0b80b31e.zip | |
Merge branch 'obsd-master' into master
| -rw-r--r-- | screen-write.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/screen-write.c b/screen-write.c index a11b4771..01f8a097 100644 --- a/screen-write.c +++ b/screen-write.c @@ -1775,13 +1775,13 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc) if (width == 0 || (ctx->flags & SCREEN_WRITE_ZWJ)) { ctx->flags &= ~SCREEN_WRITE_ZWJ; screen_write_collect_flush(ctx, 0, __func__); - if ((gc = screen_write_combine(ctx, ud, &xx)) != 0) { + if ((gc = screen_write_combine(ctx, ud, &xx)) != NULL) { cx = s->cx; cy = s->cy; screen_write_set_cursor(ctx, xx, s->cy); screen_write_initctx(ctx, &ttyctx, 0); ttyctx.cell = gc; tty_write(tty_cmd_cell, &ttyctx); - s->cx = xx + gc->data.width; s->cy = cy; + s->cx = cx; s->cy = cy; } return; } |