Merge pull request #1343 from richardgroves/patch-3

Birkemose · Birkemose · commit 56886f123d90 · 2015-10-31T10:59:46.000+01:00
Assert recognizers not already added
diff --git a/cocos2d-ui/CCScrollView.m b/cocos2d-ui/CCScrollView.m
@@ -763,6 +763,8 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecogni
 
 - (void) onEnterTransitionDidFinish
 {
+    NSAssert(_panRecognizer.view == nil && _tapRecognizer.view == nil, @"CCScrollView: Probable double call into onEnterTransitionDidFinish - gesture recognizers are already added");
+
     // Add recognizers to view
     UIView* view = [CCDirector sharedDirector].view;
     

Original file line number	Diff line number	Diff line change
`@@ -763,6 +763,8 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecogni`
`763`	`763`
`764`	`764`	`- (void) onEnterTransitionDidFinish`
`765`	`765`	`{`
	`766`	`+ NSAssert(_panRecognizer.view == nil && _tapRecognizer.view == nil, @"CCScrollView: Probable double call into onEnterTransitionDidFinish - gesture recognizers are already added");`
	`767`	`+`
`766`	`768`	`// Add recognizers to view`
`767`	`769`	`UIView* view = [CCDirector sharedDirector].view;`
`768`	`770`