fix pb when calling setTextDefaultEnabled(false) before player initia…

…lization
Dash-Industry-Forum · Jul 6, 2020 · 968b4af · 968b4af
1 parent 8b01140
commit 968b4af
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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);