Prevent NPE at app init

0f5b1e3d · Geoffrey Métais · 233ac609 · 0f5b1e3d
Commit 0f5b1e3d authored Oct 13, 2017 by Geoffrey Métais
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

vlc-android/src/org/videolan/vlc/VLCApplication.java vlc-android/src/org/videolan/vlc/VLCApplication.java +1 -1

No files found.
--- a/vlc-android/src/org/videolan/vlc/VLCApplication.java
+++ b/vlc-android/src/org/videolan/vlc/VLCApplication.java
@@ -159,7 +159,7 @@ public class VLCApplication extends Application {
    }

    public static boolean showTvUi() {
-        return sTV || mSettings.getBoolean("tv_ui", false);
+        return sTV || (mSettings != null && mSettings.getBoolean("tv_ui", false));
    }

    public static void runBackground(Runnable runnable) {