Skip to content

Commit 9112ca1

Browse files
authored
fix(UI): Fix some bugs when joining an existing cast session (#8452)
Sometimes getAudioTracks, getTextTracks and getVariantTracks returns null when joining to existing session
1 parent bd6a322 commit 9112ca1

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

ui/audio_language_selection.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ shaka.ui.AudioLanguageSelection = class extends shaka.ui.SettingsMenu {
6363

6464
/** @private */
6565
onAudioTracksChanged_() {
66-
const audioTracks = this.player.getAudioTracks();
66+
const audioTracks = this.player.getAudioTracks() || [];
6767

6868
shaka.ui.LanguageUtils.updateAudioTracks(audioTracks, this.menu,
6969
(track) => this.onAudioTrackSelected_(track),

ui/resolution_selection.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ shaka.ui.ResolutionSelection = class extends shaka.ui.SettingsMenu {
112112

113113
/** @private */
114114
updateResolutionLabels_() {
115-
const tracks = this.player.getVariantTracks();
115+
const tracks = this.player.getVariantTracks() || [];
116116
const track = tracks.find((track) => track.active);
117117
if (!track) {
118118
if (this.overflowQualityMark) {
@@ -184,7 +184,7 @@ shaka.ui.ResolutionSelection = class extends shaka.ui.SettingsMenu {
184184
// When played with src=, the variant tracks available from
185185
// player.getVariantTracks() represent languages, not resolutions.
186186
if (this.player.getLoadMode() != shaka.Player.LoadMode.SRC_EQUALS) {
187-
tracks = this.player.getVariantTracks();
187+
tracks = this.player.getVariantTracks() || [];
188188
}
189189

190190
// If there is a selected variant track, then we filter out any tracks in

ui/text_selection.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ shaka.ui.TextSelection = class extends shaka.ui.SettingsMenu {
128128

129129
/** @private */
130130
updateTextLanguages_() {
131-
const tracks = this.player.getTextTracks();
131+
const tracks = this.player.getTextTracks() || [];
132132

133133
shaka.ui.LanguageUtils.updateTextTracks(tracks, this.menu,
134134
(track) => this.onTextTrackSelected_(track),
@@ -206,7 +206,8 @@ shaka.ui.TextSelection = class extends shaka.ui.SettingsMenu {
206206

207207
/** @private */
208208
onTracksChanged_() {
209-
const hasText = this.player.getTextTracks().length > 0;
209+
const tracks = this.player.getTextTracks() || [];
210+
const hasText = tracks.length > 0;
210211
shaka.ui.Utils.setDisplay(this.button, hasText);
211212
this.updateTextLanguages_();
212213
}

0 commit comments

Comments
 (0)