Skip to content

Commit 761549c

Browse files
authored
Merge pull request #974 from wildseansy/master
Fixes #963
2 parents 7882d5c + 28bae40 commit 761549c

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

ios/RCTVideo.m

+2-5
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ -(void)removePlayerTimeObserver
151151
- (void)dealloc
152152
{
153153
[[NSNotificationCenter defaultCenter] removeObserver:self];
154-
[self removePlayerItemObservers];
155154
[self removePlayerLayer];
155+
[self removePlayerItemObservers];
156156
[_player removeObserver:self forKeyPath:playbackRate context:nil];
157157
}
158158

@@ -263,9 +263,6 @@ - (void)addPlayerItemObservers
263263
* observer set */
264264
- (void)removePlayerItemObservers
265265
{
266-
if (_playerLayer) {
267-
[_playerLayer removeObserver:self forKeyPath:readyForDisplayKeyPath];
268-
}
269266
if (_playerItemObserversSet) {
270267
[_playerItem removeObserver:self forKeyPath:statusKeyPath];
271268
[_playerItem removeObserver:self forKeyPath:playbackBufferEmptyKeyPath];
@@ -279,13 +276,13 @@ - (void)removePlayerItemObservers
279276

280277
- (void)setSrc:(NSDictionary *)source
281278
{
279+
[self removePlayerLayer];
282280
[self removePlayerTimeObserver];
283281
[self removePlayerItemObservers];
284282
_playerItem = [self playerItemForSource:source];
285283
[self addPlayerItemObservers];
286284

287285
[_player pause];
288-
[self removePlayerLayer];
289286
[_playerViewController.view removeFromSuperview];
290287
_playerViewController = nil;
291288

0 commit comments

Comments
 (0)