Merge pull request #617 from cocojoe/develop-v3

slembcke · slembcke · commit 2094dd343361 · 2014-03-06T15:26:02.000-06:00
Ensure pushed scenes directly or via transition will resume with pop correctly. Former-commit-id: ca5418c
diff --git a/cocos2d/CCDirector.m b/cocos2d/CCDirector.m
@@ -729,6 +729,7 @@ -(void) setNextScene
     {
 		[_runningScene onEnter];
 		[_runningScene onEnterTransitionDidFinish];
+        [_runningScene setPaused:NO];
 	}
 }
 
diff --git a/cocos2d/CCTransition.m b/cocos2d/CCTransition.m
@@ -246,7 +246,7 @@ - (void)update:(CCTime)delta
 				// Start incoming scene
         [[CCDirector sharedDirector] replaceScene:_incomingScene];
         [_incomingScene onEnterTransitionDidFinish];
-        _incomingScene.paused = _incomingPauseState;
+        [_incomingScene setPaused:NO];
         _incomingScene = nil;
         
         return;

Original file line number	Diff line number	Diff line change
`@@ -729,6 +729,7 @@ -(void) setNextScene`
`729`	`729`	`{`
`730`	`730`	`[_runningScene onEnter];`
`731`	`731`	`[_runningScene onEnterTransitionDidFinish];`
	`732`	`+ [_runningScene setPaused:NO];`
`732`	`733`	`}`
`733`	`734`	`}`
`734`	`735`