Merge pull request #453 from MatkovIvan/fix/inf-recursion

Benjamin Scholtysik (Reimold) · web-flow · commit 26e8967063e9 · 2017-09-06T10:46:29.000-07:00
Fix infinite recursion in setter
diff --git a/Classes/BITBlurImageAnnotation.m b/Classes/BITBlurImageAnnotation.m
@@ -76,7 +76,7 @@ - (void)setSourceImage:(UIImage *)sourceImage {
 }
 
 - (void)setSelected:(BOOL)selected {
-  self.selected = selected;
+  super.selected = selected;
   
   if (selected){
     self.selectedLayer.opacity = 0.6f;
diff --git a/Classes/BITImageAnnotation.h b/Classes/BITImageAnnotation.h
@@ -30,14 +30,11 @@
 
 @interface BITImageAnnotation : UIView
 
-@property (nonatomic) BOOL selected;
+@property (nonatomic, getter=isSelected) BOOL selected;
 @property (nonatomic) CGSize movedDelta;
 @property (nonatomic, weak) UIImage *sourceImage;
 @property (nonatomic) CGRect imageFrame;
 
 - (BOOL)resizable;
 
-- (void)setSelected:(BOOL)selected;
-- (BOOL)isSelected;
-
 @end
diff --git a/Classes/BITImageAnnotation.m b/Classes/BITImageAnnotation.m
@@ -38,14 +38,6 @@ -(BOOL)resizable {
   return NO;
 }
 
-- (void)setSelected:(BOOL)selected {
-  _selected = selected;
-}
-
-- (BOOL)isSelected {
-  return self.selected;
-}
-
 @end
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ - (void)setSourceImage:(UIImage *)sourceImage {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`- (void)setSelected:(BOOL)selected {`
`79`		`- self.selected = selected;`
	`79`	`+ super.selected = selected;`
`80`	`80`
`81`	`81`	`if (selected){`
`82`	`82`	`self.selectedLayer.opacity = 0.6f;`