Merge pull request #5507 from avalonmediasystem/fix_hls_caption

Add check for captions.content before appending file to captions list
avalonmediasystem · Dec 7, 2023 · ce1a5af · ce1a5af
2 parents 440c972 + da879f8
commit ce1a5af
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/app/views/master_files/hls_manifest.m3u8.erb b/app/views/master_files/hls_manifest.m3u8.erb
@@ -15,7 +15,9 @@ Unless required by applicable law or agreed to in writing, software distributed
 %>
 #EXTM3U
 <% if @master_file.has_captions? %>
-<% @master_file.supplemental_file_captions.append(@master_file.captions).each_with_index do |caption, index| %>
+<% captions_list = @master_file.supplemental_file_captions %>
+<% captions_list.append(@master_file.captions) if @master_file.captions.content %>
+<% captions_list.each_with_index do |caption, index| %>
 <% label = caption.is_a?(SupplementalFile) ? caption.label : 'English' %>
 <% language = caption.is_a?(SupplementalFile) ? caption.language : 'en' %>
 <% id = caption.is_a?(SupplementalFile) ? caption.id : 'master_file_caption' %>