Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2023-09-01 17:09:41 +01:00
commit cf1ed67fcc

View File

@ -1887,6 +1887,8 @@ screen_write_collect_add(struct screen_write_ctx *ctx,
u_int sx = screen_size_x(s); u_int sx = screen_size_x(s);
int collect; int collect;
ctx->flags &= ~SCREEN_WRITE_COMBINE;
/* /*
* Don't need to check that the attributes and whatnot are still the * 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 * same - input_parse will end the collection when anything that isn't