Merge pull request #946 from sridenour/v3.1

Always stop CCDirector when app is backgrounded

Author: slembcke

cocos2d/Platforms/iOS/CCAppDelegate.m

@@ -268,28 +268,32 @@ - (void) setupCocos2dWithOptions:(NSDictionary*)config
 // getting a call, pause the game
 -(void) applicationWillResignActive:(UIApplication *)application
 {
-	if( [navController_ visibleViewController] == [CCDirector sharedDirector] )
+	if([CCDirector sharedDirector].paused == NO) {
 		[[CCDirector sharedDirector] pause];
+	}
 }
 
 // call got rejected
 -(void) applicationDidBecomeActive:(UIApplication *)application
 {
 	[[CCDirector sharedDirector] setNextDeltaTimeZero:YES];
-	if( [navController_ visibleViewController] == [CCDirector sharedDirector] )
+	if([CCDirector sharedDirector].paused) {
 		[[CCDirector sharedDirector] resume];
+	}
 }
 
 -(void) applicationDidEnterBackground:(UIApplication*)application
 {
-	if( [navController_ visibleViewController] == [CCDirector sharedDirector] )
+	if([CCDirector sharedDirector].animating) {
 		[[CCDirector sharedDirector] stopAnimation];
+	}
 }
 
 -(void) applicationWillEnterForeground:(UIApplication*)application
 {
-	if( [navController_ visibleViewController] == [CCDirector sharedDirector] )
+	if([CCDirector sharedDirector].animating == NO) {
 		[[CCDirector sharedDirector] startAnimation];
+	}
 }
 
 // application will be killed