[PBW-4455] fix for closed captions

ooyala · Feb 20, 2016 · 9125eb1 · 9125eb1
1 parent 9f06e0e
commit 9125eb1
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/main/js/main_html5.js b/src/main/js/main_html5.js
@@ -473,10 +473,9 @@ require("../../../html5-common/js/utils/environment.js");
       // The textTrack added by QuickTime will not be removed by removing track element
       // But the textTrack that we added by adding track element will be removed by removing track element.
       // This first check is to check for live CC
-      if (OO.isSafari && _video.textTracks.length !== 0) {
+      if (OO.isSafari && _video.textTracks.length !== 0 && language == "CC") {
         for (var i = 0; i < _video.textTracks.length; i++) {
-          if (_video.textTracks[i].language === language ||
-              (language == "CC" && _video.textTracks[i].kind === "captions")) {
+          if (_video.textTracks[i].kind === "captions") {
             var mode = (!!params && params.mode) || 'showing';
             _video.textTracks[i].mode = mode;
           } else {
@@ -485,7 +484,7 @@ require("../../../html5-common/js/utils/environment.js");
         }
       } else {
         var captionsFormat = "closed_captions_vtt";
-        if (closedCaptions[captionsFormat] && closedCaptions[captionsFormat][language]) {
+        if (closedCaptions && closedCaptions[captionsFormat] && closedCaptions[captionsFormat][language]) {
           var captions = closedCaptions[captionsFormat][language];
           var label = captions.name;
           var src = captions.url;