From 6ee6bc5c5978d3f44da6e09a75e57c32833eacde Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Tue, 11 Aug 2015 17:48:45 +0100
Subject: [PATCH] webm demo app: Fix crash on screen touch

Fix crash on screen touch before starting playback. mediaController cannot be
used until after setMediaPlayer has been called on it.
---
 .../com/google/android/exoplayer/demo/webm/VideoPlayer.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/VideoPlayer.java b/demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/VideoPlayer.java
index c855cd63ed..ab651717d1 100644
--- a/demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/VideoPlayer.java
+++ b/demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/VideoPlayer.java
@@ -274,7 +274,7 @@ public class VideoPlayer extends Activity implements OnClickListener,
   }
 
   private void toggleControlsVisibility()  {
-    if (mediaController != null) {
+    if (mediaController != null && player != null) {
       if (mediaController.isShowing()) {
         mediaController.hide();
       } else {