Merge pull request #621 from DigitalRuby/develop-v3

slembcke · slembcke · commit f4ab30c49018 · 2014-03-06T15:26:37.000-06:00
Fix for swapBuffers crash and animations issue Former-commit-id: 072ce3a
diff --git a/cocos2d/Platforms/iOS/CCDirectorIOS.m b/cocos2d/Platforms/iOS/CCDirectorIOS.m
@@ -291,7 +291,12 @@ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interface
 -(void) viewWillAppear:(BOOL)animated
 {
 	[super viewWillAppear:animated];
-	[self startAnimation];
+
+    UIApplicationState state = UIApplication.sharedApplication.applicationState;
+    if (state != UIApplicationStateBackground)
+    {
+        [self startAnimation];
+    }
 }
 
 -(void) viewDidAppear:(BOOL)animated

Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,12 @@ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interface`
`291`	`291`	`-(void) viewWillAppear:(BOOL)animated`
`292`	`292`	`{`
`293`	`293`	`[super viewWillAppear:animated];`
`294`		`- [self startAnimation];`
	`294`	`+`
	`295`	`+ UIApplicationState state = UIApplication.sharedApplication.applicationState;`
	`296`	`+ if (state != UIApplicationStateBackground)`
	`297`	`+ {`
	`298`	`+ [self startAnimation];`
	`299`	`+ }`
`295`	`300`	`}`
`296`	`301`
`297`	`302`	`-(void) viewDidAppear:(BOOL)animated`