commit 94b0b0ce3dbff2f0db5a19bb606bf461eb515911
author Scott Moreau <oreaus@gmail.com> Thu Jun 14 01:01:56 2012 -0600
committer Kristian Høgsberg <krh@bitplanet.net> Fri Jun 15 10:21:27 2012 -0400
tree 5950d5384fe6ea2c23c387fd8c9b13c373608237
parent 3ea23d076736214b2d34c1fe57995c1a933aedbb

Increment frame_counter before calling animation->frame().

Iterate the frame_counter before calling animation->frame() because the animation might be
destroyed in this path. The first frame is now 1 (not 0) in the animation frame handlers.

src/compositor.c

diff --git a/src/compositor.c b/src/compositor.c
index 51347dc..0d07576 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -956,7 +956,7 @@
 			     struct weston_compositor, fade.animation);
 	struct weston_surface *surface;
 
-	if (animation->frame_counter == 0)
+	if (animation->frame_counter <= 1)
 		compositor->fade.spring.timestamp = msecs;
 
 	surface = compositor->fade.surface;
@@ -1073,8 +1073,8 @@
 	wl_list_init(&frame_callback_list);
 
 	wl_list_for_each_safe(animation, next, &output->animation_list, link) {
-		animation->frame(animation, output, msecs);
 		animation->frame_counter++;
+		animation->frame(animation, output, msecs);
 	}
 }
 
@@ -2735,7 +2735,7 @@
 weston_zoom_frame_z(struct weston_animation *animation,
 		struct weston_output *output, uint32_t msecs)
 {
-	if (animation->frame_counter == 0)
+	if (animation->frame_counter <= 1)
 		output->zoom.spring_z.timestamp = msecs;
 
 	weston_spring_update(&output->zoom.spring_z, msecs);