fix videoplayer crash in release mode (cocos2d#20327) (cocos2d#20330)

minggo · Mike Chen · commit 42c737fa4c2d · 2020-01-20T13:42:51.000-08:00
diff --git a/cocos/ui/UIVideoPlayer-ios.mm b/cocos/ui/UIVideoPlayer-ios.mm
@@ -110,6 +110,7 @@ -(void) dealloc
 
 -(void) clean
 {
+    _videoPlayer = nullptr;
     [self stop];
     [self removePlayerEventListener];
     [self.playerController.view removeFromSuperview];
@@ -243,7 +244,11 @@ -(void) stop
         [self seekTo:0];
         [self.playerController.player pause];
         _state = PlayerbackStopped;
-        _videoPlayer->onPlayEvent((int)VideoPlayer::EventType::STOPPED);
+        
+        // stop() will be invoked in dealloc, which is invoked by _videoPlayer's destructor,
+        // so do't send the message when _videoPlayer is being deleted.
+        if (_videoPlayer)
+            _videoPlayer->onPlayEvent((int)VideoPlayer::EventType::STOPPED);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,7 @@ -(void) dealloc`
`110`	`110`
`111`	`111`	`-(void) clean`
`112`	`112`	`{`
	`113`	`+ _videoPlayer = nullptr;`
`113`	`114`	`[self stop];`
`114`	`115`	`[self removePlayerEventListener];`
`115`	`116`	`[self.playerController.view removeFromSuperview];`
`@@ -243,7 +244,11 @@ -(void) stop`
`243`	`244`	`[self seekTo:0];`
`244`	`245`	`[self.playerController.player pause];`
`245`	`246`	`_state = PlayerbackStopped;`
`246`		`- _videoPlayer->onPlayEvent((int)VideoPlayer::EventType::STOPPED);`
	`247`	`+`
	`248`	`+ // stop() will be invoked in dealloc, which is invoked by _videoPlayer's destructor,`
	`249`	`+ // so do't send the message when _videoPlayer is being deleted.`
	`250`	`+ if (_videoPlayer)`
	`251`	`+ _videoPlayer->onPlayEvent((int)VideoPlayer::EventType::STOPPED);`
`247`	`252`	`}`
`248`	`253`	`}`
`249`	`254`