Merge branch 'jellyfin:master' into master

1 files changed, 12 insertions, 3 deletions

diff --git a/MediaBrowser.Controller/Entities/Extensions.cs b/MediaBrowser.Controller/Entities/Extensions.cs
index f3bddd29c..9ce8eebe3 100644
--- a/MediaBrowser.Controller/Entities/Extensions.cs
+++ b/MediaBrowser.Controller/Entities/Extensions.cs
@@ -1,17 +1,22 @@
+#nullable disable
+
 using System;
 using System.Linq;
+using Jellyfin.Extensions;
 using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Controller.Entities
 {
     /// <summary>
-    /// Class Extensions
+    /// Class Extensions.
     /// </summary>
     public static class Extensions
     {
         /// <summary>
         /// Adds the trailer URL.
         /// </summary>
+        /// <param name="item">Media item.</param>
+        /// <param name="url">Trailer URL.</param>
         public static void AddTrailerUrl(this BaseItem item, string url)
         {
             if (string.IsNullOrEmpty(url))
@@ -28,13 +33,17 @@ namespace MediaBrowser.Controller.Entities
                     Url = url
                 };
 
-                if (item.RemoteTrailers.Length == 0)
+                if (item.RemoteTrailers.Count == 0)
                 {
                     item.RemoteTrailers = new[] { mediaUrl };
                 }
                 else
                 {
-                    item.RemoteTrailers = item.RemoteTrailers.Concat(new[] { mediaUrl }).ToArray();
+                    var oldIds = item.RemoteTrailers;
+                    var newIds = new MediaUrl[oldIds.Count + 1];
+                    oldIds.CopyTo(newIds);
+                    newIds[oldIds.Count] = mediaUrl;
+                    item.RemoteTrailers = newIds;
                 }
             }
         }