Merge branch 'master' into scroll-damage-performance

This commit is contained in:
Daniel Eklöf 2020-03-23 19:30:20 +01:00
commit 6bc9fd4ba1
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 18 additions and 13 deletions

View file

@ -1606,7 +1606,10 @@ frame_callback(void *data, struct wl_callback *wl_callback, uint32_t callback_da
if (term->render.pending.grid) {
term->render.pending.grid = false;
grid_render(term);
/* TODO: need to check if this breaks GNOME/weston */
if (!term->delayed_render_timer.is_armed)
grid_render(term);
}
}