Merge remote-tracking branch 'refs/remotes/araker/issue1247' into dev…

…elop
OliverLetterer · Sep 22, 2011 · 3fa02fe · 3fa02fe
2 parents 16858da + 21e72be
commit 3fa02fe
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/cocos2d/CCAction.m b/cocos2d/CCAction.m
@@ -158,10 +158,11 @@ -(void) step:(ccTime) dt
 {
 	[innerAction_ step: dt];
 	if( [innerAction_ isDone] ) {
-		ccTime diff = dt + innerAction_.duration - innerAction_.elapsed;
+		ccTime diff = innerAction_.elapsed - innerAction_.duration;
 		[innerAction_ startWithTarget:target_];
 
-		// to prevent jerk. issue #390
+		// to prevent jerk. issue #390, 1247
+		[innerAction_ step: 0.0f];
 		[innerAction_ step: diff];
 	}
 }