Merge pull request #588 from nickskull/CCControl-fix

slembcke · slembcke · commit 0b09c9b665a2 · 2014-02-13T12:36:47.000-06:00
Fixing a dangling pointer in CCControl Former-commit-id: cc248f1
diff --git a/cocos2d-ui/CCControl.m b/cocos2d-ui/CCControl.m
@@ -59,7 +59,7 @@ - (id) init
 
 - (void) setTarget:(id)target selector:(SEL)selector
 {
-    __unsafe_unretained id weakTarget = target; // avoid retain cycle
+    __weak id weakTarget = target; // avoid retain cycle
     [self setBlock:^(id sender) {
         objc_msgSend(weakTarget, selector, sender);
 	}];

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ - (id) init`
`59`	`59`
`60`	`60`	`- (void) setTarget:(id)target selector:(SEL)selector`
`61`	`61`	`{`
`62`		`- __unsafe_unretained id weakTarget = target; // avoid retain cycle`
	`62`	`+ __weak id weakTarget = target; // avoid retain cycle`
`63`	`63`	`[self setBlock:^(id sender) {`
`64`	`64`	`objc_msgSend(weakTarget, selector, sender);`
`65`	`65`	`}];`