Merge pull request #519 from dhartung/fix-#518

Fix subtitle display from previous file in queue

CONTRIBUTORS.md

@@ -30,6 +30,7 @@
  - [Nickbert7](https://github.com/Nickbert7)
  - [ferferga](https://github.com/ferferga)
  - [bilde2910](https://github.com/bilde2910)
+ - [Daniel Hartung](https://github.com/dhartung)
 
 # Emby Contributors
 

src/components/htmlvideoplayer/plugin.js

@@ -1192,24 +1192,26 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
             }
 
             var trackElement = null;
-            var expectedId = 'manualTrack' + track.Index;
+            if (videoElement.textTracks && videoElement.textTracks.length > 0) {
+                trackElement = videoElement.textTracks[0];
 
-            // get list of tracks
-            var allTracks = videoElement.textTracks;
-            for (var i = 0; i < allTracks.length; i++) {
+                // This throws an error in IE, but is fine in chrome
+                // In IE it's not necessary anyway because changing the src seems to be enough
+                try {
+                    trackElement.mode = 'showing';
+                    while (trackElement.cues.length) {
+                        trackElement.removeCue(trackElement.cues[0]);
+                    }
+                } catch (e) {
+                    console.log('Error removing cue from textTrack');
+                }
 
-                var currentTrack = allTracks[i];
-
-                if (currentTrack.label === expectedId) {
-                    trackElement = currentTrack;
-                    break;
+                trackElement.mode = 'disabled';
             } else {
-                    currentTrack.mode = 'disabled';
+                // There is a function addTextTrack but no function for removeTextTrack
+                // Therefore we add ONE element and replace its cue data
+                trackElement = videoElement.addTextTrack('subtitles', 'manualTrack', 'und');
             }
-            }
-
-            if (!trackElement) {
-                trackElement = videoElement.addTextTrack('subtitles', 'manualTrack' + track.Index, track.Language || 'und');
 
             // download the track json
             fetchSubtitles(track, item).then(function (data) {
@@ -1227,9 +1229,6 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
                 });
                 trackElement.mode = 'showing';
             });
-            } else {
-                trackElement.mode = 'showing';
-            }
         }
 
         function updateSubtitleText(timeMs) {