Merge branch 'master' into Preservation-of-Watched-Status-on-Re-watch

1 files changed, 8 insertions, 3 deletions

diff --git a/Jellyfin.Server/Filters/FileResponseFilter.cs b/Jellyfin.Server/Filters/FileResponseFilter.cs
index cd0acadf32..64aea62519 100644
--- a/Jellyfin.Server/Filters/FileResponseFilter.cs
+++ b/Jellyfin.Server/Filters/FileResponseFilter.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using Jellyfin.Api.Attributes;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
 namespace Jellyfin.Server.Filters
@@ -14,7 +14,7 @@ namespace Jellyfin.Server.Filters
         {
             Schema = new OpenApiSchema
             {
-                Type = "string",
+                Type = JsonSchemaType.String,
                 Format = "binary"
             }
         };
@@ -22,6 +22,11 @@ namespace Jellyfin.Server.Filters
         /// <inheritdoc />
         public void Apply(OpenApiOperation operation, OperationFilterContext context)
         {
+            if (operation.Responses is null)
+            {
+                return;
+            }
+
             foreach (var attribute in context.ApiDescription.ActionDescriptor.EndpointMetadata)
             {
                 if (attribute is ProducesFileAttribute producesFileAttribute)
@@ -31,7 +36,7 @@ namespace Jellyfin.Server.Filters
                         .FirstOrDefault(o => o.Key.Equals(SuccessCode, StringComparison.Ordinal));
 
                     // Operation doesn't have a response.
-                    if (response.Value is null)
+                    if (response.Value?.Content is null)
                     {
                         continue;
                     }