Fixed duplicated expansion backgrounds race conditions

HanCheng · Nov 16, 2014 · 9d78338 · 9d78338
1 parent eaa3f10
commit 9d78338
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/MGSwipeTableCell/MGSwipeTableCell.m b/MGSwipeTableCell/MGSwipeTableCell.m
@@ -180,6 +180,9 @@ -(void) endExpansioAnimated:(BOOL) animated
 {
     if (_expandedButton) {
         _expandedButtonAnimated = _expandedButton;
+        if (_expansionBackgroundAnimated && _expansionBackgroundAnimated != _expansionBackground) {
+            [_expansionBackgroundAnimated removeFromSuperview];
+        }
         _expansionBackgroundAnimated = _expansionBackground;
         _expansionBackground = nil;
         _expandedButton = nil;
@@ -195,6 +198,10 @@ -(void) endExpansioAnimated:(BOOL) animated
             [_expansionBackgroundAnimated removeFromSuperview];
         }];
     }
+    else if (_expansionBackground) {
+        [_expansionBackground removeFromSuperview];
+        _expansionBackground = nil;
+    }
 }
 
 -(UIView*) getExpandedButton
@@ -737,6 +744,10 @@ - (void)setSwipeOffset:(CGFloat) newOffset;
 
     MGSwipeButtonsView * activeButtons = sign < 0 ? _rightView : _leftView;
     if (!activeButtons || offset == 0) {
+        if (_leftView)
+            [_leftView endExpansioAnimated:NO];
+        if (_rightView)
+            [_rightView endExpansioAnimated:NO];
         [self hideSwipeOverlayIfNeeded];
         _targetOffset = 0;
         [self updateState:MGSwipeStateNone];