diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2020-11-15 14:35:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-15 14:35:34 -0500 |
| commit | 2f426dfc97677deffb60420078b20a7f5f03977e (patch) | |
| tree | 89772dd894e735d657522105a29884d2117a5bfa /Jellyfin.Api/Controllers/ImageController.cs | |
| parent | 7caf1662eca2ea8826f3277e8b9d5c8c782fd03d (diff) | |
| parent | 056c44010b437b0f718cb10b1ed66a7f38d61874 (diff) | |
Merge pull request #4458 from crobibero/dotnet-5
Upgrade to Net5
Diffstat (limited to 'Jellyfin.Api/Controllers/ImageController.cs')
| -rw-r--r-- | Jellyfin.Api/Controllers/ImageController.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Jellyfin.Api/Controllers/ImageController.cs b/Jellyfin.Api/Controllers/ImageController.cs index 4a67c1aed..76e53b9a5 100644 --- a/Jellyfin.Api/Controllers/ImageController.cs +++ b/Jellyfin.Api/Controllers/ImageController.cs @@ -5,6 +5,7 @@ using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.IO; using System.Linq; +using System.Net.Mime; using System.Threading; using System.Threading.Tasks; using Jellyfin.Api.Attributes; @@ -1268,7 +1269,7 @@ namespace Jellyfin.Api.Controllers Response.Headers.Add(key, value); } - Response.ContentType = imageContentType; + Response.ContentType = imageContentType ?? MediaTypeNames.Text.Plain; Response.Headers.Add(HeaderNames.Age, Convert.ToInt64((DateTime.UtcNow - dateImageModified).TotalSeconds).ToString(CultureInfo.InvariantCulture)); Response.Headers.Add(HeaderNames.Vary, HeaderNames.Accept); |
