Unverified Commit 21cfcfd5 authored by Hampton Maxwell's avatar Hampton Maxwell Committed by GitHub
Browse files

Merge pull request #1075 from react-native-community/bugfix/remove-playerlayer-observer 

Fix crash when clearing playerLayer observer after already unset
parents b3291ca1 026afabe

ios/RCTVideo.m

+5 −0
Changes for ios/RCTVideo.m: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ static NSString *const timedMetadata = @"timedMetadata"; 
  BOOL _playerItemObserversSet;

  BOOL _playerBufferEmpty;

  AVPlayerLayer *_playerLayer;

  BOOL _playerLayerObserverSet;

  AVPlayerViewController *_playerViewController;

  NSURL *_videoURL;
@@ -794,6 +795,7 @@ static NSString *const timedMetadata = @"timedMetadata"; 
      // resize mode must be set before layer is added

      [self setResizeMode:_resizeMode];

      [_playerLayer addObserver:self forKeyPath:readyForDisplayKeyPath options:NSKeyValueObservingOptionNew context:nil];

      _playerLayerObserverSet = YES;



      [self.layer addSublayer:_playerLayer];

      self.layer.needsDisplayOnBoundsChange = YES;
@@ -832,7 +834,10 @@ static NSString *const timedMetadata = @"timedMetadata"; 
- (void)removePlayerLayer

{

    [_playerLayer removeFromSuperlayer];

    if (_playerLayerObserverSet) {

      [_playerLayer removeObserver:self forKeyPath:readyForDisplayKeyPath];

      _playerLayerObserverSet = NO;

    }

    _playerLayer = nil;

}