From 3edd6ab767e2a3ae30a740ae851bc4b96e12afc6 Mon Sep 17 00:00:00 2001 From: joshjryan Date: Fri, 4 Oct 2024 07:51:08 -0500 Subject: [PATCH] Fix allow inputContainer to be null for Live TV (#12770) --- MediaBrowser.Model/Dlna/StreamBuilder.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs index 4a666ac47b..a25ddc367d 100644 --- a/MediaBrowser.Model/Dlna/StreamBuilder.cs +++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs @@ -389,9 +389,10 @@ namespace MediaBrowser.Model.Dlna /// The . /// The object to get the video stream from. /// The normalized input container. - public static string NormalizeMediaSourceFormatIntoSingleContainer(string inputContainer, DeviceProfile? profile, DlnaProfileType type, DirectPlayProfile? playProfile = null) + public static string? NormalizeMediaSourceFormatIntoSingleContainer(string inputContainer, DeviceProfile? profile, DlnaProfileType type, DirectPlayProfile? playProfile = null) { - if (profile is null || !inputContainer.Contains(',', StringComparison.OrdinalIgnoreCase)) + // If the source is Live TV the inputContainer will be null until the mediasource is probed on first access + if (profile is null || string.IsNullOrEmpty(inputContainer) || !inputContainer.Contains(',', StringComparison.OrdinalIgnoreCase)) { return inputContainer; }