aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaus Vium <cvium@users.noreply.github.com>2020-11-25 08:20:57 +0100
committerGitHub <noreply@github.com>2020-11-25 08:20:57 +0100
commite86385b74d9e115929141bfd233a6035a8574d0f (patch)
tree71aa82f4944b5159d77424acaf9679d7fa3e2bb3
parent8275a5d635f0fe462443ebc0b0e0d63a958025c8 (diff)
parent0acea5b0770dc08516b032f0d27dee9b559afa7d (diff)
Merge pull request #4575 from crobibero/null-ref
Don't throw null reference if ContentType is null.
-rw-r--r--Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
index 2de447ad9..f7507e6ba 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
@@ -63,7 +63,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
var extension = "ts";
var requiresRemux = false;
- var contentType = response.Content.Headers.ContentType.ToString();
+ var contentType = response.Content.Headers.ContentType?.ToString() ?? string.Empty;
if (contentType.IndexOf("matroska", StringComparison.OrdinalIgnoreCase) != -1)
{
requiresRemux = true;