From 968b4af03ee36ced82b5e9b5b126583eb2c204bc Mon Sep 17 00:00:00 2001
From: Jeff Cunat <jeanfrancois.cunat@orange.com>
Date: Mon, 6 Jul 2020 15:16:01 +0200
Subject: [PATCH] fix pb when calling setTextDefaultEnabled(false) before
 player initialization

---
 samples/captioning/multi-track-captions.html | 2 +-
 src/streaming/text/TextController.js         | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/samples/captioning/multi-track-captions.html b/samples/captioning/multi-track-captions.html
index 1ce0f9900e..2329076c29 100644
--- a/samples/captioning/multi-track-captions.html
+++ b/samples/captioning/multi-track-captions.html
@@ -54,8 +54,8 @@
         function setTextDefaultEnabled() {
             var checkbox = document.getElementById("textDefaultEnabled");
             if (!checkbox.indeterminate) {
-                player.setTextDefaultEnabled(checkbox.checked);
                 document.getElementById("textDefaultEnabledValue").innerHTML = checkbox.checked;
+                player.setTextDefaultEnabled(checkbox.checked);
             } else {
                 document.getElementById("textDefaultEnabledValue").innerHTML = 'undefined';
             }
diff --git a/src/streaming/text/TextController.js b/src/streaming/text/TextController.js
index 02e6e28cd7..a363ed1cc8 100644
--- a/src/streaming/text/TextController.js
+++ b/src/streaming/text/TextController.js
@@ -300,12 +300,11 @@ function TextController() {
 
         allTracksAreDisabled = idx === -1 ? true : false;
 
-        if (allTracksAreDisabled) {
-            mediaController.saveTextSettingsDisabled();
-        }
-
         let oldTrackIdx = textTracks.getCurrentTrackIdx();
         if (oldTrackIdx !== idx) {
+            if (allTracksAreDisabled && mediaController) {
+                mediaController.saveTextSettingsDisabled();
+            }
             textTracks.setModeForTrackIdx(oldTrackIdx, Constants.TEXT_HIDDEN);
             textTracks.setCurrentTrackIdx(idx);
             textTracks.setModeForTrackIdx(idx, Constants.TEXT_SHOWING);