Merge pull request #974 from wildseansy/master

Fixes #963
TheWidlarzGroup · Jun 4, 2018 · 761549c · 761549c
2 parents 7882d5c + 28bae40
commit 761549c
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/ios/RCTVideo.m b/ios/RCTVideo.m
@@ -151,8 +151,8 @@ -(void)removePlayerTimeObserver
 - (void)dealloc
 {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
-  [self removePlayerItemObservers];
   [self removePlayerLayer];
+  [self removePlayerItemObservers];
   [_player removeObserver:self forKeyPath:playbackRate context:nil];
 }
 
@@ -263,9 +263,6 @@ - (void)addPlayerItemObservers
  * observer set */
 - (void)removePlayerItemObservers
 {
-  if (_playerLayer) {
-    [_playerLayer removeObserver:self forKeyPath:readyForDisplayKeyPath];
-  }
   if (_playerItemObserversSet) {
     [_playerItem removeObserver:self forKeyPath:statusKeyPath];
     [_playerItem removeObserver:self forKeyPath:playbackBufferEmptyKeyPath];
@@ -279,13 +276,13 @@ - (void)removePlayerItemObservers
 
 - (void)setSrc:(NSDictionary *)source
 {
+  [self removePlayerLayer];
   [self removePlayerTimeObserver];
   [self removePlayerItemObservers];
   _playerItem = [self playerItemForSource:source];
   [self addPlayerItemObservers];
 
   [_player pause];
-  [self removePlayerLayer];
   [_playerViewController.view removeFromSuperview];
   _playerViewController = nil;