Merge remote-tracking branch 'upstream/master' into quickconnect

1 files changed, 9 insertions, 5 deletions

diff --git a/MediaBrowser.Api/ItemLookupService.cs b/MediaBrowser.Api/ItemLookupService.cs
index 0bbe7e1cf..68e3dfa59 100644
--- a/MediaBrowser.Api/ItemLookupService.cs
+++ b/MediaBrowser.Api/ItemLookupService.cs
@@ -299,22 +299,26 @@ namespace MediaBrowser.Api
         {
             var result = await _providerManager.GetSearchImage(providerName, url, CancellationToken.None).ConfigureAwait(false);
 
-            var ext = result.ContentType.Split('/').Last();
+            var ext = result.ContentType.Split('/')[^1];
 
             var fullCachePath = GetFullCachePath(urlHash + "." + ext);
 
             Directory.CreateDirectory(Path.GetDirectoryName(fullCachePath));
-            using (var stream = result.Content)
+            var stream = result.Content;
+
+            await using (stream.ConfigureAwait(false))
             {
-                using var fileStream = new FileStream(
+                var fileStream = new FileStream(
                     fullCachePath,
                     FileMode.Create,
                     FileAccess.Write,
                     FileShare.Read,
                     IODefaults.FileStreamBufferSize,
                     true);
-
-                await stream.CopyToAsync(fileStream).ConfigureAwait(false);
+                await using (fileStream.ConfigureAwait(false))
+                {
+                    await stream.CopyToAsync(fileStream).ConfigureAwait(false);
+                }
             }
 
             Directory.CreateDirectory(Path.GetDirectoryName(pointerCachePath));