From 58b1f669c3223d3cefe2765a49165b2cef07ebad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20M=C3=A9tais?= <geoffrey.metais@gmail.com>
Date: Wed, 22 Jun 2016 15:50:04 +0200
Subject: [PATCH] Prevent NPE

---
 .../org/videolan/vlc/gui/video/VideoPlayerActivity.java  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
index 9d828c119..a1c8d1cfe 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
@@ -3042,10 +3042,11 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
                     mHandler.post(new Runnable() {
                         @Override
                         public void run() {
-                            for(String file : mSubtitleSelectedFiles) {
-                                Log.i(TAG, "Adding user-selected subtitle " + file);
-                                mService.addSubtitleTrack(file, true);
-                            }
+                            if (mService != null)
+                                for(String file : mSubtitleSelectedFiles) {
+                                    Log.i(TAG, "Adding user-selected subtitle " + file);
+                                    mService.addSubtitleTrack(file, true);
+                                }
                         }
                     });
                 }
-- 
GitLab