Fixed crash in AndroidPlatformHelper

15403606 · Sylvain Berfini · e4a9af55 · 15403606
Commit 15403606 authored Dec 12, 2019 by Sylvain Berfini 🎩
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

wrappers/java/classes/tools/AndroidPlatformHelper.java wrappers/java/classes/tools/AndroidPlatformHelper.java +6 -4

No files found.
--- a/wrappers/java/classes/tools/AndroidPlatformHelper.java
+++ b/wrappers/java/classes/tools/AndroidPlatformHelper.java
@@ -514,11 +514,13 @@ public class AndroidPlatformHelper {
 			public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
 				Log.i("[Platform Helper] Rendering surface texture destroyed");

-				if (mNativePtr != 0 && surface.equals(mVideoTextureView.getSurfaceTexture())) {
+				if (mNativePtr != 0 && mVideoTextureView != null) {
+					if (surface.equals(mVideoTextureView.getSurfaceTexture()) {
 						Log.i("[Platform Helper] Current rendering surface texture is no longer available");
 						mVideoTextureView = null;
 						setNativeVideoWindowId(mNativePtr, null);
 					}
+				}

 				if (!DeviceUtils.isSurfaceTextureReleased(surface)) {
 					Log.i("[Platform Helper] Releasing window surface");