[Android] Videoplayer: Fix NPE on Chromebooks

Geoffrey Métais git at videolan.org
Wed Jan 23 15:35:11 CET 2019


vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Wed Jan 23 15:21:38 2019 +0100| [440597a39dc6e8a9560f7a729a166bf5cc1a61a0] | committer: Geoffrey Métais

Videoplayer: Fix NPE on Chromebooks

> https://code.videolan.org/videolan/vlc-android/commit/440597a39dc6e8a9560f7a729a166bf5cc1a61a0
---

 libvlc/src/org/videolan/libvlc/util/DisplayManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libvlc/src/org/videolan/libvlc/util/DisplayManager.java b/libvlc/src/org/videolan/libvlc/util/DisplayManager.java
index 41538e46e..5dc3239c5 100644
--- a/libvlc/src/org/videolan/libvlc/util/DisplayManager.java
+++ b/libvlc/src/org/videolan/libvlc/util/DisplayManager.java
@@ -43,7 +43,7 @@ public class DisplayManager {
         mSelectedRenderer = selectedRender;
         mMediaRouter = (MediaRouter) activity.getApplicationContext().getSystemService(Context.MEDIA_ROUTER_SERVICE);
         mTextureView = textureView;
-        mPresentation = !cloneMode && !benchmark && selectedRender.getValue() == null ? createPresentation() : null;
+        mPresentation = !cloneMode && !benchmark && selectedRender != null && selectedRender.getValue() == null ? createPresentation() : null;
         if (mSelectedRenderer != null) {
             mRendererItem = mSelectedRenderer.getValue();
             mSelectedRenderer.observeForever(mRendererObs);



More information about the Android mailing list