Replacing ASVideoNode's playButton now cleans-up the previous button'…

…s state
mikezucc · Apr 18, 2016 · 983c2f1 · 983c2f1
1 parent cdb926c
commit 983c2f1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/AsyncDisplayKit/ASVideoNode.mm b/AsyncDisplayKit/ASVideoNode.mm
@@ -339,7 +339,10 @@ - (void)visibilityDidChange:(BOOL)isVisible
 - (void)setPlayButton:(ASButtonNode *)playButton
 {
   ASDN::MutexLocker l(_videoLock);
-
+
+  [_playButton removeTarget:self action:@selector(tapped) forControlEvents:ASControlNodeEventTouchUpInside];
+  [_playButton removeFromSupernode];
+
   _playButton = playButton;
 
   [self addSubnode:playButton];
@@ -565,6 +568,7 @@ - (BOOL)shouldBePlaying
 
 - (void)dealloc
 {
+  [_playButton removeTarget:self action:@selector(tapped) forControlEvents:ASControlNodeEventTouchUpInside];
   [self removePlayerItemObservers];
 
   @try {

diff --git a/AsyncDisplayKitTests/ASVideoNodeTests.m b/AsyncDisplayKitTests/ASVideoNodeTests.m
@@ -297,4 +297,19 @@ - (void)testSettingVideoGravityChangesPlaceholderContentMode
   XCTAssertEqual(UIViewContentModeScaleAspectFill, _videoNode.placeholderImageNode.contentMode);
 }
 
+- (void)testChangingPlayButtonPerformsProperCleanup
+{
+  ASButtonNode *firstButton = _videoNode.playButton;
+  XCTAssertTrue([firstButton.allTargets containsObject:_videoNode]);
+
+  ASButtonNode *secondButton = [[ASButtonNode alloc] init];
+  _videoNode.playButton = secondButton;
+
+  XCTAssertTrue([secondButton.allTargets containsObject:_videoNode]);
+  XCTAssertEqual(_videoNode, secondButton.supernode);
+
+  XCTAssertFalse([firstButton.allTargets containsObject:_videoNode]);
+  XCTAssertNotEqual(_videoNode, firstButton.supernode);
+}
+
 @end