compositor: Clear repaint_scheduled when an idle repaint is cancelled

We don't hit this case often, but if we did, the compositor would get stuck
thinking a repaint was already scheduled.
dev
Kristian Høgsberg 13 years ago
parent 30c018be3a
commit 2200d70e56
  1. 3
      src/compositor.c

@ -833,7 +833,6 @@ weston_output_repaint(struct weston_output *output, int msecs)
pixman_region32_fini(&total_damage); pixman_region32_fini(&total_damage);
output->repaint_needed = 0; output->repaint_needed = 0;
output->repaint_scheduled = 1;
wl_list_for_each_safe(cb, cnext, &output->frame_callback_list, link) { wl_list_for_each_safe(cb, cnext, &output->frame_callback_list, link) {
wl_resource_post_event(&cb->resource, WL_CALLBACK_DONE, msecs); wl_resource_post_event(&cb->resource, WL_CALLBACK_DONE, msecs);
@ -852,6 +851,8 @@ idle_repaint(void *data)
/* An idle repaint may have been cancelled by vt switching away. */ /* An idle repaint may have been cancelled by vt switching away. */
if (output->repaint_needed) if (output->repaint_needed)
weston_output_repaint(output, weston_compositor_get_time()); weston_output_repaint(output, weston_compositor_get_time());
else
output->repaint_scheduled = 0;
} }
WL_EXPORT void WL_EXPORT void

Loading…
Cancel
Save