Transition 2.0: Fixing a condition causing issues on calling resume / pause on the same frame. Casenum #45908, #46052.

Author: alexf-corona

transition.lua

@@ -324,17 +324,21 @@ lib.pause = function( whatToPause )
 		if targetType and not tween._generatedByComposer then
 			if targetType == "all" then
 				tween._paused = true
+				tween._resume = false
 			elseif targetType == "tag" then
 				if tween.tag == iterationTarget then
 					tween._paused = true
+					tween._resume = false
 				end
 			elseif targetType == "displayobject" then
 				if tween._target == iterationTarget then
 					tween._paused = true
+					tween._resume = false
 				end
 			elseif targetType == "transition" then
 				if tween == iterationTarget then
 					tween._paused = true
+					tween._resume = false
 				end
 			end
 		end
@@ -374,29 +378,33 @@ lib.resume = function( whatToResume )
 	-- iterate the table
 
 	local transitionTable = lib._transitionTable
+	
 	-- if enterframe was run already, if we have any running tweens they won't be in the lib._transitionTable variable, but in lib._enterFrameTweens
 	if #transitionTable == 0 then
 		transitionTable = lib._enterFrameTweens
 	end
 
 	for i,tween in ipairs( transitionTable ) do 
-		-- check for any cancel lib variables
-		-- only cancel if the tween was not generated by the composer library
-		local shouldResumeTween = false
+		-- check for any resume lib variables
+		-- only resume if the tween was not generated by the composer library
 		if targetType and not tween._generatedByComposer then
 			if targetType == "all" then
 				tween._resume = true
+				tween._paused = false
 			elseif targetType == "tag" then
 				if tween.tag == iterationTarget then
 					tween._resume = true
+					tween._paused = false
 				end
 			elseif targetType == "displayobject" then
 				if tween._target == iterationTarget then
 					tween._resume = true
+					tween._paused = false
 				end
 			elseif targetType == "transition" then
 				if tween == whatToResume then
 					tween._resume = true
+					tween._paused = false
 				end
 			end
 		end
@@ -471,7 +479,7 @@ function lib:enterFrame ( event )
 	-- create a local copy of the transition table, to avoid a race condition
 	local currentActiveTweens = lib._transitionTable
 	lib._enterFrameTweens = lib._transitionTable
-	
+		
 	lib._transitionTable = {}
 
 	-- get the current event time
@@ -482,7 +490,6 @@ function lib:enterFrame ( event )
 
 	-- iterate the transition table
 	for i,tween in ipairs( currentActiveTweens ) do 
-		
 		-- if the transition object is paused
 		if tween._paused then
 			-- handle tweens marked as paused
@@ -511,7 +518,7 @@ function lib:enterFrame ( event )
 
 				-- nil out the lastPausedTime variable of the transition object
 				tween._lastPausedTime = nil
-				tween._paused = false
+				tween._paused = nil
 
 				-- dispatch the onResume method on the object
 				local listener = tween._onResume